diff --git a/packages/datalib/src/TableGridDisplay.ts b/packages/datalib/src/TableGridDisplay.ts
index 9d25f44b8..9adbc7a5b 100644
--- a/packages/datalib/src/TableGridDisplay.ts
+++ b/packages/datalib/src/TableGridDisplay.ts
@@ -39,7 +39,8 @@ export class TableGridDisplay extends GridDisplay {
     public getDictionaryDescription: DictionaryDescriptionFunc = null,
     isReadOnly = false,
     public isRawMode = false,
-    public currentSettings = null
+    public currentSettings = null,
+    public areReferencesAllowed = true
   ) {
     super(config, setConfig, cache, setCache, driver, dbinfo, serverVersion, currentSettings);
 
@@ -248,6 +249,7 @@ export class TableGridDisplay extends GridDisplay {
   }
 
   processReferences(select: Select, displayedColumnInfo: DisplayedColumnInfo, options) {
+    if (!this.areReferencesAllowed) return;
     this.addJoinsFromExpandedColumns(select, this.columns, 'basetbl', displayedColumnInfo);
     if (!options.isExport && this.displayOptions.showHintColumns) {
       this.addHintsToSelect(select);
diff --git a/packages/web/src/datagrid/ColumnHeaderControl.svelte b/packages/web/src/datagrid/ColumnHeaderControl.svelte
index 1d7e33872..6ecc61757 100644
--- a/packages/web/src/datagrid/ColumnHeaderControl.svelte
+++ b/packages/web/src/datagrid/ColumnHeaderControl.svelte
@@ -95,11 +95,13 @@
 
       { divider: true },
 
-      allowDefineVirtualReferences && { onClick: handleDefineVirtualForeignKey, text: 'Define virtual foreign key' },
-      column.foreignKey && {
-        onClick: handleCustomizeDescriptions,
-        text: 'Customize description',
-      },
+      isProApp() &&
+        allowDefineVirtualReferences && { onClick: handleDefineVirtualForeignKey, text: 'Define virtual foreign key' },
+      column.foreignKey &&
+        isProApp() && {
+          onClick: handleCustomizeDescriptions,
+          text: 'Customize description',
+        },
     ];
   }
 </script>
diff --git a/packages/web/src/datagrid/ColumnManagerRow.svelte b/packages/web/src/datagrid/ColumnManagerRow.svelte
index 9d55f241b..630af469d 100644
--- a/packages/web/src/datagrid/ColumnManagerRow.svelte
+++ b/packages/web/src/datagrid/ColumnManagerRow.svelte
@@ -7,6 +7,7 @@
   import { showModal } from '../modals/modalTools';
   import ColumnEditorModal from '../tableeditor/ColumnEditorModal.svelte';
   import { editorDeleteColumn } from 'dbgate-tools';
+  import { isProApp } from '../utility/proTools';
 
   export let column;
   export let display;
@@ -59,13 +60,17 @@
   on:mouseup
 >
   <div>
-    <span class="expandColumnIcon" style={`margin-right: ${5 + (column.uniquePath.length - 1) * 10}px`}>
-      <FontIcon
-        icon={column.isExpandable ? plusExpandIcon(display.isExpandedColumn(column.uniqueName)) : 'icon invisible-box'}
-        on:click={() => display.toggleExpandedColumn(column.uniqueName)}
-        data-testid="ColumnManagerRow_expand_{column.uniqueName}"
-      />
-    </span>
+    {#if isProApp()}
+      <span class="expandColumnIcon" style={`margin-right: ${5 + (column.uniquePath.length - 1) * 10}px`}>
+        <FontIcon
+          icon={column.isExpandable
+            ? plusExpandIcon(display.isExpandedColumn(column.uniqueName))
+            : 'icon invisible-box'}
+          on:click={() => display.toggleExpandedColumn(column.uniqueName)}
+          data-testid="ColumnManagerRow_expand_{column.uniqueName}"
+        />
+      </span>
+    {/if}
     {#if isJsonView}
       <FontIcon icon="img column" />
     {:else}
diff --git a/packages/web/src/datagrid/TableDataGrid.svelte b/packages/web/src/datagrid/TableDataGrid.svelte
index 46d0b434b..a8dcc8445 100644
--- a/packages/web/src/datagrid/TableDataGrid.svelte
+++ b/packages/web/src/datagrid/TableDataGrid.svelte
@@ -30,6 +30,7 @@
   import SqlFormView from '../formview/SqlFormView.svelte';
   import { getBoolSettingsValue } from '../settings/settingsTools';
   import { getDictionaryDescription } from '../utility/dictionaryDescriptionTools';
+  import { isProApp } from '../utility/proTools';
 
   export let conid;
   export let database;
@@ -82,7 +83,8 @@
             extendedDbInfo?.tables?.find(x => x.pureName == pureName && x.schemaName == schemaName)
               ?.tablePermissionRole == 'read',
           isRawMode,
-          $settingsValue
+          $settingsValue,
+          isProApp()
         )
       : null;