diff --git a/packages/builder/src/builderStore/store/frontend.js b/packages/builder/src/builderStore/store/frontend.js
index c94c759792..9f1a20605f 100644
--- a/packages/builder/src/builderStore/store/frontend.js
+++ b/packages/builder/src/builderStore/store/frontend.js
@@ -82,7 +82,7 @@ export const getFrontendStore = () => {
         libraries: application.componentLibraries,
         components,
         clientFeatures: {
-          ...state.clientFeatures,
+          ...INITIAL_FRONTEND_STATE.clientFeatures,
           ...components.features,
         },
         name: application.name,
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/DataSourceSelect.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/DataSourceSelect.svelte
index 8f5f7ef807..dc1b24077a 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/DataSourceSelect.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/DataSourceSelect.svelte
@@ -149,7 +149,7 @@
       </Button>
       <DrawerContent slot="body">
         <Layout noPadding>
-          {#if getQueryParams(value._id).length > 0}
+          {#if getQueryParams(value).length > 0}
             <ParameterBuilder
               bind:customParams={value.queryParams}
               parameters={getQueryParams(value)}