diff --git a/packages/datalib/src/TableFormViewDisplay.ts b/packages/datalib/src/TableFormViewDisplay.ts
index aef9a559c..3a3cac501 100644
--- a/packages/datalib/src/TableFormViewDisplay.ts
+++ b/packages/datalib/src/TableFormViewDisplay.ts
@@ -28,10 +28,20 @@ export class TableFormViewDisplay extends FormViewDisplay {
     setConfig: ChangeConfigFunc,
     cache: GridCache,
     setCache: ChangeCacheFunc,
-    dbinfo: DatabaseInfo
+    dbinfo: DatabaseInfo,
+    displayOptions
   ) {
     super(config, setConfig, cache, setCache, driver, dbinfo);
-    this.gridDisplay = new TableGridDisplay(tableName, driver, config, setConfig, cache, setCache, dbinfo);
+    this.gridDisplay = new TableGridDisplay(
+      tableName,
+      driver,
+      config,
+      setConfig,
+      cache,
+      setCache,
+      dbinfo,
+      displayOptions
+    );
     this.gridDisplay.addAllExpandedColumnsToSelected = true;
 
     this.isLoadedCorrectly = this.gridDisplay.isLoadedCorrectly && !!this.driver;
diff --git a/packages/datalib/src/TableGridDisplay.ts b/packages/datalib/src/TableGridDisplay.ts
index c9ba5a703..f213fd8ed 100644
--- a/packages/datalib/src/TableGridDisplay.ts
+++ b/packages/datalib/src/TableGridDisplay.ts
@@ -17,7 +17,8 @@ export class TableGridDisplay extends GridDisplay {
     setConfig: ChangeConfigFunc,
     cache: GridCache,
     setCache: ChangeCacheFunc,
-    dbinfo: DatabaseInfo
+    dbinfo: DatabaseInfo,
+    public displayOptions: any
   ) {
     super(config, setConfig, cache, setCache, driver, dbinfo);
 
@@ -168,7 +169,7 @@ export class TableGridDisplay extends GridDisplay {
 
   processReferences(select: Select, displayedColumnInfo: DisplayedColumnInfo, options) {
     this.addJoinsFromExpandedColumns(select, this.columns, 'basetbl', displayedColumnInfo);
-    if (!options.isExport) {
+    if (!options.isExport && this.displayOptions.showHintColumns) {
       this.addHintsToSelect(select);
     }
   }
diff --git a/packages/web/src/datagrid/TableDataGrid.svelte b/packages/web/src/datagrid/TableDataGrid.svelte
index d8787bd76..5d9b6238a 100644
--- a/packages/web/src/datagrid/TableDataGrid.svelte
+++ b/packages/web/src/datagrid/TableDataGrid.svelte
@@ -20,6 +20,7 @@
   import ReferenceHeader from './ReferenceHeader.svelte';
   import SqlDataGridCore from './SqlDataGridCore.svelte';
   import SqlFormView from '../formview/SqlFormView.svelte';
+  import { getBoolSettingsValue } from '../settings/settingsTools';
 
   export let conid;
   export let database;
@@ -52,7 +53,8 @@
         setConfig,
         cache,
         setCache,
-        $dbinfo
+        $dbinfo,
+        { showHintColumns: getBoolSettingsValue('dataGrid.showHintColumns', true) }
       )
     : null;
 
@@ -64,7 +66,8 @@
         setConfig,
         cache,
         setCache,
-        $dbinfo
+        $dbinfo,
+        { showHintColumns: getBoolSettingsValue('dataGrid.showHintColumns', true) }
       )
     : null;
 
diff --git a/packages/web/src/settings/SettingsModal.svelte b/packages/web/src/settings/SettingsModal.svelte
index 0f7dc00ea..ce824de8c 100644
--- a/packages/web/src/settings/SettingsModal.svelte
+++ b/packages/web/src/settings/SettingsModal.svelte
@@ -26,7 +26,8 @@
 
       <div class="heading">Data grid</div>
       <FormCheckboxField name="dataGrid.hideLeftColumn" label="Hide left column by default" />
-      <FormTextField name="dataGrid.pageSize" label="Page size" defaultValue="100" />
+      <FormTextField name="dataGrid.pageSize" label="Page size (number of rows for incremental loading)" defaultValue="100" />
+      <FormCheckboxField name="dataGrid.showHintColumns" label="Show foreign key hints" defaultValue={true} />
 
       <div slot="footer">
         <FormSubmit value="OK" on:click={handleOk} />