diff --git a/src/canvas/model/Canvas.js b/src/canvas/model/Canvas.js
index ba2e42ba2..0e6b069b5 100644
--- a/src/canvas/model/Canvas.js
+++ b/src/canvas/model/Canvas.js
@@ -47,7 +47,7 @@ export default Backbone.Model.extend({
 
     if (model && device) {
       const { width, height } = device.attributes;
-      model.set({ width, height });
+      model.set({ width, height }, { noUndo: 1 });
     }
   },
 
diff --git a/src/canvas/model/Frame.js b/src/canvas/model/Frame.js
index 89c34831a..469decfe5 100644
--- a/src/canvas/model/Frame.js
+++ b/src/canvas/model/Frame.js
@@ -78,7 +78,8 @@ export default Model.extend({
   },
 
   getHead() {
-    return [...this.get('head')];
+    const head = this.get('head') || [];
+    return [...head];
   },
 
   setHead(value) {