diff --git a/common/config/src/main/resources/default.conf b/common/config/src/main/resources/default.conf
index 0ce2a2e38b6..62e533e694c 100644
--- a/common/config/src/main/resources/default.conf
+++ b/common/config/src/main/resources/default.conf
@@ -64,6 +64,9 @@ gui {
     datasets_enabled = true
     datasets_enabled = ${?GUI_TABS_DATASETS_ENABLED}
 
+    compute_enabled = true
+    compute_enabled = ${?GUI_TABS_COMPUTE_ENABLED}
+
     quota_enabled = true
     quota_enabled = ${?GUI_TABS_QUOTA_ENABLED}
 
diff --git a/frontend/src/app/common/type/gui-config.ts b/frontend/src/app/common/type/gui-config.ts
index d8786c1dc08..3b7554e8d4c 100644
--- a/frontend/src/app/common/type/gui-config.ts
+++ b/frontend/src/app/common/type/gui-config.ts
@@ -53,6 +53,7 @@ export interface SidebarTabs {
   your_work_enabled: boolean;
   projects_enabled: boolean;
   workflows_enabled: boolean;
+  compute_enabled: boolean;
   datasets_enabled: boolean;
   quota_enabled: boolean;
   forum_enabled: boolean;
diff --git a/frontend/src/app/dashboard/component/admin/settings/admin-settings.component.html b/frontend/src/app/dashboard/component/admin/settings/admin-settings.component.html
index a0ea29e77b5..319e13c3457 100644
--- a/frontend/src/app/dashboard/component/admin/settings/admin-settings.component.html
+++ b/frontend/src/app/dashboard/component/admin/settings/admin-settings.component.html
@@ -190,6 +190,15 @@ <h2 class="page-title">General Settings</h2>
         </nz-switch>
       </div>
 
+      <div class="submenu-item">
+        <span>Compute</span>
+        <nz-switch
+          class="tab-switch"
+          [(ngModel)]="sidebarTabs.compute_enabled"
+          [nzDisabled]="!sidebarTabs.your_work_enabled">
+        </nz-switch>
+      </div>
+
       <div class="submenu-item">
         <span>Quota</span>
         <nz-switch
diff --git a/frontend/src/app/dashboard/component/admin/settings/admin-settings.component.ts b/frontend/src/app/dashboard/component/admin/settings/admin-settings.component.ts
index 2fbba318fbe..3d0e7590652 100644
--- a/frontend/src/app/dashboard/component/admin/settings/admin-settings.component.ts
+++ b/frontend/src/app/dashboard/component/admin/settings/admin-settings.component.ts
@@ -67,6 +67,7 @@ export class AdminSettingsComponent implements OnInit {
     your_work_enabled: false,
     projects_enabled: false,
     workflows_enabled: false,
+    compute_enabled: false,
     datasets_enabled: false,
     quota_enabled: false,
     forum_enabled: false,
diff --git a/frontend/src/app/dashboard/component/dashboard.component.html b/frontend/src/app/dashboard/component/dashboard.component.html
index 4813f0b4e2c..b04eafb3107 100644
--- a/frontend/src/app/dashboard/component/dashboard.component.html
+++ b/frontend/src/app/dashboard/component/dashboard.component.html
@@ -98,6 +98,7 @@
             <span>Datasets</span>
           </li>
           <li
+            *ngIf="sidebarTabs.compute_enabled"
             nz-menu-item
             nz-tooltip="Manage computing units"
             nzMatchRouter="true"
diff --git a/frontend/src/app/dashboard/component/dashboard.component.ts b/frontend/src/app/dashboard/component/dashboard.component.ts
index 5761ce3a8a6..57e6e8e284e 100644
--- a/frontend/src/app/dashboard/component/dashboard.component.ts
+++ b/frontend/src/app/dashboard/component/dashboard.component.ts
@@ -99,6 +99,7 @@ export class DashboardComponent implements OnInit {
     projects_enabled: false,
     workflows_enabled: false,
     datasets_enabled: false,
+    compute_enabled: false,
     quota_enabled: false,
     forum_enabled: false,
     about_enabled: false,