diff --git a/packages/core/components/Puck/components/Fields/index.tsx b/packages/core/components/Puck/components/Fields/index.tsx
index 526488b0b1..08255cf367 100644
--- a/packages/core/components/Puck/components/Fields/index.tsx
+++ b/packages/core/components/Puck/components/Fields/index.tsx
@@ -150,10 +150,12 @@ const useResolvedFields = (): [FieldsType, boolean] => {
 
           setFieldsLoading(false);
         });
-      } else {
-        setResolvedFields(defaultFields);
+
+        return;
       }
     }
+
+    setResolvedFields(defaultFields);
   }, [
     data,
     defaultFields,