diff --git a/src/octoprint/static/js/app/viewmodels/printerprofiles.js b/src/octoprint/static/js/app/viewmodels/printerprofiles.js
index f19484a6..368f80ce 100644
--- a/src/octoprint/static/js/app/viewmodels/printerprofiles.js
+++ b/src/octoprint/static/js/app/viewmodels/printerprofiles.js
@@ -476,8 +476,16 @@ $(function() {
             });
             self.profiles.updateItems(items);
             self.defaultProfile(defaultProfile);
-            self.currentProfile(currentProfile);
-            self.currentProfileData(currentProfileData);
+
+            if (currentProfile && currentProfileData) {
+                self.currentProfile(currentProfile);
+                self.currentProfileData(currentProfileData);
+            } else {
+                // shouldn't normally happen, but just to not have anything else crash...
+                log.warn("Current printer profile could not be detected, using default values");
+                self.currentProfile("");
+                self.currentProfileData(ko.mapping.fromJS(cleanProfile(), self.currentProfileData));
+            }
         };
 
         self.addProfile = function(callback) {