diff --git a/src/octoprint/static/js/app/viewmodels/system.js b/src/octoprint/static/js/app/viewmodels/system.js
index 7973a6cf..307e1c0f 100644
--- a/src/octoprint/static/js/app/viewmodels/system.js
+++ b/src/octoprint/static/js/app/viewmodels/system.js
@@ -28,7 +28,9 @@ $(function() {
                     action.actionSource = "core";
                     actions.push(action);
                 });
-                actions.push({action: "divider"});
+                if (response.custom && response.custom.length) {
+                    actions.push({action: "divider"});
+                }
             }
             _.each(response.custom, function(data) {
                 var action = _.extend({}, data);