diff --git a/src/Explorer/Controls/Settings/SettingsSubComponents/ContainerVectorPolicyComponent.tsx b/src/Explorer/Controls/Settings/SettingsSubComponents/ContainerVectorPolicyComponent.tsx
index 23ccdc84c..ca4d63a04 100644
--- a/src/Explorer/Controls/Settings/SettingsSubComponents/ContainerVectorPolicyComponent.tsx
+++ b/src/Explorer/Controls/Settings/SettingsSubComponents/ContainerVectorPolicyComponent.tsx
@@ -15,7 +15,7 @@ export const ContainerVectorPolicyComponent: React.FC<ContainerVectorPolicyCompo
     <Stack {...titleAndInputStackProps} styles={{ root: { position: "relative" } }}>
       <EditorReact
         language={"json"}
-        content={JSON.stringify(vectorEmbeddingPolicy, null, 4)}
+        content={JSON.stringify(vectorEmbeddingPolicy || {}, null, 4)}
         isReadOnly={true}
         wordWrap={"on"}
         ariaLabel={"Container vector policy"}
diff --git a/src/Explorer/Panes/AddCollectionPanel.tsx b/src/Explorer/Panes/AddCollectionPanel.tsx
index 7bb0f553d..274bd0d1d 100644
--- a/src/Explorer/Panes/AddCollectionPanel.tsx
+++ b/src/Explorer/Panes/AddCollectionPanel.tsx
@@ -1312,7 +1312,7 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
   }
 
   private shouldShowVectorSearchParameters() {
-    return isVectorSearchEnabled() && this.shouldShowCollectionThroughputInput();
+    return isVectorSearchEnabled() && (isServerlessAccount() || this.shouldShowCollectionThroughputInput());
   }
 
   private parseUniqueKeys(): DataModels.UniqueKeyPolicy {