diff --git a/src/octoprint/static/js/app/viewmodels/files.js b/src/octoprint/static/js/app/viewmodels/files.js
index 82ec4005..c3717abb 100644
--- a/src/octoprint/static/js/app/viewmodels/files.js
+++ b/src/octoprint/static/js/app/viewmodels/files.js
@@ -194,7 +194,7 @@ function GcodeFilesViewModel(printerStateViewModel, loginStateViewModel) {
         var output = "<p><strong>Uploaded:</strong> " + formatDate(data["date"]) + "</p>";
         if (data["gcodeAnalysis"]) {
             output += "<p>";
-            if (data["gcodeAnalysis"]["filament"]) {
+            if (data["gcodeAnalysis"]["filament"] && typeof(data["gcodeAnalysis"]["filament"]) == "object") {
                 var filament = data["gcodeAnalysis"]["filament"];
                 if (_.keys(filament).length == 1) {
                     output += "<strong>Filament:</strong> " + formatFilament(data["gcodeAnalysis"]["filament"]["tool" + 0]) + "<br>";
diff --git a/src/octoprint/static/js/app/viewmodels/printerstate.js b/src/octoprint/static/js/app/viewmodels/printerstate.js
index d376b7d9..1ba8cdc2 100644
--- a/src/octoprint/static/js/app/viewmodels/printerstate.js
+++ b/src/octoprint/static/js/app/viewmodels/printerstate.js
@@ -124,7 +124,7 @@ function PrinterStateViewModel(loginStateViewModel) {
         self.estimatedPrintTime(data.estimatedPrintTime);
 
         var result = [];
-        if (_.keys(data.filament).length > 0) {
+        if (data.filament && typeof(data.filament) == "object" && _.keys(data.filament).length > 0) {
             var i = 0;
             do {
                 var key = "tool" + i;