diff --git a/src/control/content/index.html b/src/control/content/index.html
index 669b412..37cd540 100644
--- a/src/control/content/index.html
+++ b/src/control/content/index.html
@@ -81,6 +81,7 @@
                 }
 
                 if (result && result.data && !angular.equals({}, result.data) && result.id) {
+                    if(!result.data.design) result.data.design = $scope.data.design;
                     $scope.data = result.data;
                     $scope.id = result.id;
                     if($scope.data.content && $scope.data.content.carouselImages)
@@ -142,6 +143,9 @@
                     return;
                 }
 
+                if(!newObj.content || !newObj.design)
+                    return;
+
                 buildfire.datastore.save(newObj, function (err, result) {
                     if (err || !result) {
                         console.error('Error saving the widget details: ', err);
diff --git a/src/control/design/index.html b/src/control/design/index.html
index 561a391..4d3df72 100644
--- a/src/control/design/index.html
+++ b/src/control/design/index.html
@@ -73,6 +73,7 @@
                 }
 
                 if (result && result.data && !angular.equals({}, result.data)) {
+                    if(!result.data.design) result.data.design = $scope.data.design;
                     $scope.data = result.data;
                     $scope.id = result.id;
                 }
@@ -111,6 +112,9 @@
                     return;
                 }
 
+                if(!newObj.content || !newObj.design)
+                    return;
+
                 buildfire.datastore.save(newObj, function (err, result) {
                     if (err || !result) {
                         console.error('Error saving the widget details: ', err);
diff --git a/src/widget/widget.js b/src/widget/widget.js
index 6fcb2ae..da91d57 100644
--- a/src/widget/widget.js
+++ b/src/widget/widget.js
@@ -54,12 +54,14 @@ function init() {
     state.data = result.data && result.data.content
       ? result.data
       : defaultData;
+    !state.data.design ? state.data.design = defaultData.design : null;
     render();
   });
 
   // Keep state up to date with control changes
   buildfire.datastore.onUpdate((result) => {
     state.data = result.data;
+    !state.data.design ? state.data.design = defaultData.design : null;
     render();
   });
 }