diff --git a/ui/src/app/customer/customer-fieldset.tpl.html b/ui/src/app/customer/customer-fieldset.tpl.html
index a67a4391df..f24eb3048b 100644
--- a/ui/src/app/customer/customer-fieldset.tpl.html
+++ b/ui/src/app/customer/customer-fieldset.tpl.html
@@ -19,7 +19,7 @@
 <md-button ng-click="onManageAssets({event: $event})" ng-show="!isEdit" class="md-raised md-primary">{{ 'customer.manage-assets' | translate }}</md-button>
 <md-button ng-click="onManageDevices({event: $event})" ng-show="!isEdit" class="md-raised md-primary">{{ 'customer.manage-devices' | translate }}</md-button>
 <md-button ng-click="onManageDashboards({event: $event})" ng-show="!isEdit" class="md-raised md-primary">{{ 'customer.manage-dashboards' | translate }}</md-button>
-<md-button ng-click="onManageEdges({event: $event})" ng-show="!isEdit" class="md-raised md-primary">{{ 'customer.manage-edges' | translate }}</md-button>
+<md-button ng-click="onManageEdges({event: $event})" ng-show="!isEdit && vm.isEdgesSupportEnabled" class="md-raised md-primary">{{ 'customer.manage-edges' | translate }}</md-button>
 <md-button ng-click="onDeleteCustomer({event: $event})" ng-show="!isEdit && !isPublic" class="md-raised md-primary">{{ 'customer.delete' | translate }}</md-button>
 
 <div layout="row">
diff --git a/ui/src/app/customer/customer.controller.js b/ui/src/app/customer/customer.controller.js
index 2d1d2202a8..8c20cddb6b 100644
--- a/ui/src/app/customer/customer.controller.js
+++ b/ui/src/app/customer/customer.controller.js
@@ -21,7 +21,7 @@ import customerCard from './customer-card.tpl.html';
 /* eslint-enable import/no-unresolved, import/default */
 
 /*@ngInject*/
-export default function CustomerController(customerService, $state, $stateParams, $translate, types) {
+export default function CustomerController(customerService, $state, $stateParams, $translate, types, userService) {
 
     var customerActionsList = [
         {
@@ -76,21 +76,29 @@ export default function CustomerController(customerService, $state, $stateParams
                 }
             },
             icon: "dashboard"
-        },
-        {
-            onAction: function ($event, item) {
-                openCustomerEdges($event, item);
-            },
-            name: function() { return $translate.instant('edge.edge-instances') },
-            details: function(customer) {
-                if (customer && customer.additionalInfo && customer.additionalInfo.isPublic) {
-                    return $translate.instant('customer.manage-public-edges')
-                } else {
-                    return $translate.instant('customer.manage-customer-edges')
-                }
-            },
-            icon: "router"
-        },
+        }];
+
+    if (userService.isEdgesSupportEnabled()) {
+        customerActionsList.push(
+            {
+                onAction: function ($event, item) {
+                    openCustomerEdges($event, item);
+                },
+                name: function() { return $translate.instant('edge.edge-instances') },
+                details: function(customer) {
+                    if (customer && customer.additionalInfo && customer.additionalInfo.isPublic) {
+                        return $translate.instant('customer.manage-public-edges')
+                    } else {
+                        return $translate.instant('customer.manage-customer-edges')
+                    }
+                },
+                icon: "router",
+                isEnabled: false
+            }
+        )
+    }
+
+    customerActionsList.push(
         {
             onAction: function ($event, item) {
                 vm.grid.deleteItem($event, item);
@@ -102,12 +110,14 @@ export default function CustomerController(customerService, $state, $stateParams
                 return customer && (!customer.additionalInfo || !customer.additionalInfo.isPublic);
             }
         }
-    ];
+    );
 
     var vm = this;
 
     vm.types = types;
 
+    vm.isEdgesSupportEnabled = userService.isEdgesSupportEnabled();
+
     vm.customerGridConfig = {
 
         refreshParamsFunc: null,