diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+layout.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+layout.svelte
index c583598ef..9707a98a9 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+layout.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+layout.svelte
@@ -194,23 +194,25 @@
 
 <CreateEntity bind:show={$showCreateEntity} onCreateEntity={createEntity} />
 
-<Modal title="Generate sample data" bind:show={$randomDataModalState.show}>
-    <Layout.Stack style="gap: 28px;">
-        {#if $randomDataModalState.columns}
-            <SuggestionsInput required context="data" showSampleCountPicker={!terminology.schema} />
-        {:else}
-            <Seekbar max={100} breakpointCount={5} bind:value={$randomDataModalState.value} />
-        {/if}
-    </Layout.Stack>
-
-    <svelte:fragment slot="footer">
-        <Layout.Stack direction="row" gap="s" justifyContent="flex-end">
-            <Button text on:click={() => resetSampleFieldsConfig()}>Cancel</Button>
-            <Button
-                on:click={() => {
-                    $randomDataModalState.onSubmit?.();
-                    $randomDataModalState.show = false;
-                }}>Create</Button>
+{#if !$randomDataModalState.managed}
+    <Modal title="Generate sample data" bind:show={$randomDataModalState.show}>
+        <Layout.Stack style="gap: 28px;">
+            {#if $randomDataModalState.columns}
+                <SuggestionsInput required context="data" showSampleCountPicker={!terminology.schema} />
+            {:else}
+                <Seekbar max={100} breakpointCount={5} bind:value={$randomDataModalState.value} />
+            {/if}
         </Layout.Stack>
-    </svelte:fragment>
-</Modal>
+
+        <svelte:fragment slot="footer">
+            <Layout.Stack direction="row" gap="s" justifyContent="flex-end">
+                <Button text on:click={() => resetSampleFieldsConfig()}>Cancel</Button>
+                <Button
+                    on:click={() => {
+                        $randomDataModalState.onSubmit?.();
+                        $randomDataModalState.show = false;
+                    }}>Create</Button>
+            </Layout.Stack>
+        </svelte:fragment>
+    </Modal>
+{/if}
\ No newline at end of file
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+page.svelte
index e2ff918e2..25d9d230d 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+page.svelte
@@ -251,6 +251,8 @@
                         subtitle="Generate data for testing"
                         onClick={() => {
                             $randomDataModalState.show = true;
+                            $randomDataModalState.columns = true;
+                            $randomDataModalState.managed = false;
                         }} />
 
                     <EmptySheetCards
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/spreadsheet.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/spreadsheet.svelte
index 7fd2a110d..b71f1c307 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/spreadsheet.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/spreadsheet.svelte
@@ -836,6 +836,7 @@
                                 on:click={() => {
                                     $randomDataModalState.show = true;
                                     $randomDataModalState.columns = true;
+                                    $randomDataModalState.managed = false;
                                 }}>Generate sample data</Button.Button>
                         </div>
                     {/if}
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/store.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/store.ts
index 27d0325b5..e3252d1fe 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/store.ts
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/store.ts
@@ -55,6 +55,7 @@ export type RandomDataSchema = {
     show: boolean;
     value: number;
     columns?: boolean;
+    managed: boolean,
     onSubmit?: () => Promise<void> | void;
 };
 
@@ -100,7 +101,8 @@ export const databaseSubNavigationItems = [
 
 export const randomDataModalState = writable<RandomDataSchema>({
     show: false,
-    value: 25 // initial value!
+    value: 25, // initial value!
+    managed: true, // true means don't use the one in database/+layout.svelte
 });
 
 export const spreadsheetLoading = writable(false);
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+page.svelte
index 10ed898f3..23bbe0bc7 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+page.svelte
@@ -341,6 +341,7 @@
                             subtitle="Generate data for testing"
                             onClick={() => {
                                 $randomDataModalState.show = true;
+                                $randomDataModalState.managed = true;
                             }} />
                     {/snippet}
                 </EmptySheet>
@@ -392,6 +393,7 @@
                         subtitle="Generate data for testing"
                         onClick={() => {
                             $randomDataModalState.show = true;
+                            $randomDataModalState.managed = true;
                         }} />
 
                     {#if isCloud}
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/spreadsheet.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/spreadsheet.svelte
index f644923b9..aa1ccb902 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/spreadsheet.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/spreadsheet.svelte
@@ -1244,6 +1244,7 @@
                                 variant="secondary"
                                 on:click={() => {
                                     $randomDataModalState.show = true;
+                                    $randomDataModalState.managed = true;
                                 }}>Generate sample data</Button.Button>
                         </div>
                     {/if}