diff --git a/packages/ui/src/components/Component.svelte b/packages/ui/src/components/Component.svelte
index e83560e83e..4ea4888512 100644
--- a/packages/ui/src/components/Component.svelte
+++ b/packages/ui/src/components/Component.svelte
@@ -73,7 +73,7 @@
           .then((res) => {
             if (current === counter) {
               Ctor = res
-              _props = props
+              _props = filterDefaultUndefined(props, props)
               loading = false
             }
           })
@@ -85,11 +85,11 @@
       } else {
         loading = false
         Ctor = component
-        _props = props
+        _props = filterDefaultUndefined(props, props)
       }
     } else {
       Ctor = _is
-      _props = props
+      _props = filterDefaultUndefined(props, props)
     }
   }
 
diff --git a/plugins/attachment-resources/src/components/AttachmentImagePreview.svelte b/plugins/attachment-resources/src/components/AttachmentImagePreview.svelte
index 7a8c2bd7fd..53db098025 100644
--- a/plugins/attachment-resources/src/components/AttachmentImagePreview.svelte
+++ b/plugins/attachment-resources/src/components/AttachmentImagePreview.svelte
@@ -42,7 +42,7 @@
   $: dimensions = getDimensions(value, size)
 
   function getDimensions (value: Attachment, size: AttachmentImageSize): Dimensions {
-    if (size === 'auto') {
+    if (size === 'auto' || size == null) {
       return {
         width: 300,
         height: 300,