diff --git a/ui/src/app/api/entity.service.js b/ui/src/app/api/entity.service.js
index df684c334e..153fe11b50 100644
--- a/ui/src/app/api/entity.service.js
+++ b/ui/src/app/api/entity.service.js
@@ -910,6 +910,9 @@ function EntityService($http, $q, $filter, $translate, $log, userService, device
                 }
             }
         }
+        if (userService.isEdgesSupportEnabled()) {
+            delete entityTypes.edge;
+        }
         return entityTypes;
     }