diff --git a/app/portainer/components/endpoint-list/endpoint-item/endpointItem.html b/app/portainer/components/endpoint-list/endpoint-item/endpointItem.html
index a2f96a392..a44f84163 100644
--- a/app/portainer/components/endpoint-list/endpoint-item/endpointItem.html
+++ b/app/portainer/components/endpoint-list/endpoint-item/endpointItem.html
@@ -23,11 +23,11 @@
         </span>
         <span>
 
-          <span class="small">
+          <span class="small" ng-if="$ctrl.model.GroupName">
             Group: {{ $ctrl.model.GroupName }}
           </span>
           <button
-            ng-if="$ctrl.isAdmin" 
+            ng-if="$ctrl.isAdmin"
             class="btn btn-link btn-xs"
             ng-click="$ctrl.editEndpoint($event)"><i class="fa fa-pencil-alt"></i>
           </button>