diff --git a/src/octoprint/static/js/app/viewmodels/system.js b/src/octoprint/static/js/app/viewmodels/system.js
index fd2307e0..054ceff6 100644
--- a/src/octoprint/static/js/app/viewmodels/system.js
+++ b/src/octoprint/static/js/app/viewmodels/system.js
@@ -26,12 +26,14 @@ $(function() {
 
         self.fromCommandResponse = function(response) {
             var actions = [];
-            _.each(response.core, function(data) {
-                var action = _.extend({}, data);
-                action.actionSource = "core";
-                actions.push(action);
-            });
-            actions.push({action: "divider"});
+            if (response.core && response.core.length) {
+                _.each(response.core, function(data) {
+                    var action = _.extend({}, data);
+                    action.actionSource = "core";
+                    actions.push(action);
+                });
+                actions.push({action: "divider"});
+            }
             _.each(response.custom, function(data) {
                 var action = _.extend({}, data);
                 action.actionSource = "custom";