diff --git a/ui-ngx/src/app/modules/home/pages/customer/customer.component.html b/ui-ngx/src/app/modules/home/pages/customer/customer.component.html
index 750be237c3..0dda6645cf 100644
--- a/ui-ngx/src/app/modules/home/pages/customer/customer.component.html
+++ b/ui-ngx/src/app/modules/home/pages/customer/customer.component.html
@@ -43,7 +43,8 @@
   <button mat-raised-button color="primary"
           [disabled]="(isLoading$ | async)"
           (click)="onEntityAction($event, 'manageEdges')"
-          [fxShow]="!isEdit">
+          [fxShow]="!isEdit"
+          *ngIf="edgesSupportEnabled()">
     {{'customer.manage-edges' | translate }}
   </button>
   <button mat-raised-button color="primary"
diff --git a/ui-ngx/src/app/modules/home/pages/customer/customer.component.ts b/ui-ngx/src/app/modules/home/pages/customer/customer.component.ts
index 5d58d2be2c..aed8dd606d 100644
--- a/ui-ngx/src/app/modules/home/pages/customer/customer.component.ts
+++ b/ui-ngx/src/app/modules/home/pages/customer/customer.component.ts
@@ -23,6 +23,7 @@ import { ActionNotificationShow } from '@app/core/notification/notification.acti
 import { TranslateService } from '@ngx-translate/core';
 import { ContactBasedComponent } from '../../components/entity/contact-based.component';
 import { EntityTableConfig } from '@home/models/entity/entities-table-config.models';
+import { getCurrentAuthState } from '@core/auth/auth.selectors';
 
 @Component({
   selector: 'tb-customer',
@@ -78,4 +79,9 @@ export class CustomerComponent extends ContactBasedComponent<Customer> {
       }));
   }
 
+  edgesSupportEnabled() {
+    const authState = getCurrentAuthState(this.store);
+    return authState.edgesSupportEnabled;
+  }
+
 }
diff --git a/ui-ngx/src/app/modules/home/pages/customer/customers-table-config.resolver.ts b/ui-ngx/src/app/modules/home/pages/customer/customers-table-config.resolver.ts
index d523dcf9a5..145319e685 100644
--- a/ui-ngx/src/app/modules/home/pages/customer/customers-table-config.resolver.ts
+++ b/ui-ngx/src/app/modules/home/pages/customer/customers-table-config.resolver.ts
@@ -31,6 +31,9 @@ import { Customer } from '@app/shared/models/customer.model';
 import { CustomerService } from '@app/core/http/customer.service';
 import { CustomerComponent } from '@modules/home/pages/customer/customer.component';
 import { CustomerTabsComponent } from '@home/pages/customer/customer-tabs.component';
+import { getCurrentAuthState } from '@core/auth/auth.selectors';
+import { Store } from '@ngrx/store';
+import { AppState } from '@core/core.state';
 
 @Injectable()
 export class CustomersTableConfigResolver implements Resolve<EntityTableConfig<Customer>> {
@@ -40,13 +43,15 @@ export class CustomersTableConfigResolver implements Resolve<EntityTableConfig<C
   constructor(private customerService: CustomerService,
               private translate: TranslateService,
               private datePipe: DatePipe,
-              private router: Router) {
+              private router: Router,
+              private store: Store<AppState>) {
 
     this.config.entityType = EntityType.CUSTOMER;
     this.config.entityComponent = CustomerComponent;
     this.config.entityTabsComponent = CustomerTabsComponent;
     this.config.entityTranslations = entityTypeTranslations.get(EntityType.CUSTOMER);
     this.config.entityResources = entityTypeResources.get(EntityType.CUSTOMER);
+    const authState = getCurrentAuthState(this.store);
 
     this.config.columns.push(
       new DateEntityTableColumn<Customer>('createdTime', 'common.created-time', this.datePipe, '150px'),
@@ -55,7 +60,6 @@ export class CustomersTableConfigResolver implements Resolve<EntityTableConfig<C
       new EntityTableColumn<Customer>('country', 'contact.country', '25%'),
       new EntityTableColumn<Customer>('city', 'contact.city', '25%')
     );
-
     this.config.cellActionDescriptors.push(
       {
         name: this.translate.instant('customer.manage-customer-users'),
@@ -95,19 +99,22 @@ export class CustomersTableConfigResolver implements Resolve<EntityTableConfig<C
         icon: 'dashboard',
         isEnabled: (customer) => true,
         onAction: ($event, entity) => this.manageCustomerDashboards($event, entity)
-      },
-      {
-        name: this.translate.instant('customer.manage-customer-edges'),
-        nameFunction: (customer) => {
-          return customer.additionalInfo && customer.additionalInfo.isPublic
-            ? this.translate.instant('customer.manage-public-edges')
-            : this.translate.instant('customer.manage-customer-edges');
-        },
-        icon: 'router',
-        isEnabled: (customer) => true,
-        onAction: ($event, entity) => this.manageCustomerEdges($event, entity)
-      },
-    );
+      });
+    if (authState.edgesSupportEnabled) {
+      this.config.cellActionDescriptors.push(
+        {
+          name: this.translate.instant('customer.manage-customer-edges'),
+          nameFunction: (customer) => {
+            return customer.additionalInfo && customer.additionalInfo.isPublic
+              ? this.translate.instant('customer.manage-public-edges')
+              : this.translate.instant('customer.manage-customer-edges');
+          },
+          icon: 'router',
+          isEnabled: (customer) => true,
+          onAction: ($event, entity) => this.manageCustomerEdges($event, entity)
+        }
+      );
+    }
 
     this.config.deleteEntityTitle = customer => this.translate.instant('customer.delete-customer-title', { customerTitle: customer.title });
     this.config.deleteEntityContent = () => this.translate.instant('customer.delete-customer-text');
diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json
index 42a0a9057d..c3c45fcc5a 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -627,7 +627,8 @@
         "default-customer-required": "Default customer is required in order to debug dashboard on Tenant level",
         "search": "Search customers",
         "selected-customers": "{ count, plural, 1 {1 customer} other {# customers} } selected",
-        "edges": "Customer edge instances"
+        "edges": "Customer edge instances",
+        "manage-edges": "Manage edges"
     },
     "datetime": {
         "date-from": "Date from",