diff --git a/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue b/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue
index c0d6701949..fca7838e90 100644
--- a/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue
+++ b/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue
@@ -102,7 +102,7 @@ export default {
 }
 .component-custom {
   outline: none;
-  width: 100%;
+  width: 100% !important;
   height: 100%;
 }
 </style>
diff --git a/frontend/src/components/widget/DeWidget/DeDate.vue b/frontend/src/components/widget/DeWidget/DeDate.vue
index 3819591e05..c29f6c2421 100644
--- a/frontend/src/components/widget/DeWidget/DeDate.vue
+++ b/frontend/src/components/widget/DeWidget/DeDate.vue
@@ -39,6 +39,9 @@ export default {
     if ((this.options.attrs.type === 'date' || this.options.attrs.type === 'daterange') && Array.isArray(this.options.value) && this.options.value.length === 0) {
       this.options.value = null
     }
+    if (!!this.options && !!this.options.value && Object.keys(this.options.value).length === 0) {
+      this.options.value = null
+    }
   },
   methods: {
     search() {