diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/DataProviderSelect.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/DataProviderSelect.svelte
index 9944f6b0e8..e773ba5e5d 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/DataProviderSelect.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/DataProviderSelect.svelte
@@ -1,5 +1,6 @@
 <script>
   import { Select } from "@budibase/bbui"
+  import { makePropSafe } from "@budibase/string-templates"
   import { currentAsset, store } from "builderStore"
   import { findComponentPath } from "builderStore/storeUtils"
 
@@ -16,7 +17,7 @@
   <option value="">Choose option</option>
   {#if providers}
     {#each providers as component}
-      <option value={`{{ literal ${component._id} }}`}>
+      <option value={`{{ literal ${makePropSafe(component._id)} }}`}>
         {component._instanceName}
       </option>
     {/each}