diff --git a/app/docker/helpers/infoHelper.js b/app/docker/helpers/infoHelper.js
index 3d84d9523..4582cc821 100644
--- a/app/docker/helpers/infoHelper.js
+++ b/app/docker/helpers/infoHelper.js
@@ -12,10 +12,7 @@ angular.module('portainer.docker')
     };
 
     if (type === 2) {
-      mode.provider = 'DOCKER_SWARM_MODE';
-      mode.role = 'MANAGER';
       mode.agentProxy = true;
-      return mode;
     }
 
     if (!info.Swarm || _.isEmpty(info.Swarm.NodeID)) {
diff --git a/app/docker/views/containers/containers.html b/app/docker/views/containers/containers.html
index 15acb78bc..1a8be9a25 100644
--- a/app/docker/views/containers/containers.html
+++ b/app/docker/views/containers/containers.html
@@ -12,9 +12,9 @@
     <containers-datatable
       title-text="Containers" title-icon="fa-server"
       dataset="containers" table-key="containers"
-      order-by="Status" 
+      order-by="Status"
       show-ownership-column="applicationState.application.authentication"
-      show-host-column="applicationState.endpoint.mode.agentProxy"
+      show-host-column="applicationState.endpoint.mode.agentProxy && applicationState.endpoint.mode.provider === 'DOCKER_SWARM_MODE'"
       show-add-action="true"
     ></containers-datatable>
   </div>
diff --git a/app/docker/views/containers/create/createcontainer.html b/app/docker/views/containers/create/createcontainer.html
index d3ab79faa..4c6f957c1 100644
--- a/app/docker/views/containers/create/createcontainer.html
+++ b/app/docker/views/containers/create/createcontainer.html
@@ -107,7 +107,7 @@
             <!-- !port-mapping-input-list -->
           </div>
           <!-- !port-mapping -->
-          <div ng-if="applicationState.endpoint.mode.agentProxy">
+          <div ng-if="applicationState.endpoint.mode.agentProxy && applicationState.endpoint.mode.provider === 'DOCKER_SWARM_MODE'">
             <div class="col-sm-12 form-section-title">
               Deployment
             </div>
diff --git a/app/docker/views/dashboard/dashboard.html b/app/docker/views/dashboard/dashboard.html
index d93608e54..26c22be3c 100644
--- a/app/docker/views/dashboard/dashboard.html
+++ b/app/docker/views/dashboard/dashboard.html
@@ -3,14 +3,14 @@
   <rd-header-content>Endpoint summary</rd-header-content>
 </rd-header>
 
-<div class="row" ng-if="applicationState.endpoint.mode.agentProxy">
+<div class="row" ng-if="applicationState.endpoint.mode.agentProxy && applicationState.endpoint.mode.provider === 'DOCKER_SWARM_MODE'">
   <div class="col-sm-12">
     <dashboard-cluster-agent-info></dashboard-cluster-agent-info>
   </div>
 </div>
 
-<div class="row" ng-if="!applicationState.endpoint.mode.agentProxy">
-  <div class="col-sm-12" ng-if="applicationState.endpoint.mode.provider === 'DOCKER_SWARM_MODE'">
+<div class="row" ng-if="!applicationState.endpoint.mode.agentProxy && applicationState.endpoint.mode.provider === 'DOCKER_SWARM_MODE'">
+  <div class="col-sm-12">
     <rd-widget>
       <rd-widget-body>
         <div class="col-sm-12 form-section-title">
@@ -32,7 +32,9 @@
       </rd-widget-body>
     </rd-widget>
   </div>
+</div>
 
+<div class="row" ng-if="!applicationState.endpoint.mode.agentProxy || applicationState.endpoint.mode.provider !== 'DOCKER_SWARM_MODE'">
   <div class="col-sm-12">
     <rd-widget>
       <rd-widget-header icon="fa-tachometer-alt" title-text="Node info"></rd-widget-header>
diff --git a/app/docker/views/images/build/buildimage.html b/app/docker/views/images/build/buildimage.html
index f5451cc28..35742d59f 100644
--- a/app/docker/views/images/build/buildimage.html
+++ b/app/docker/views/images/build/buildimage.html
@@ -194,7 +194,7 @@
                 </div>
               </div>
               <!-- !url -->
-              <div ng-if="applicationState.endpoint.mode.agentProxy">
+              <div ng-if="applicationState.endpoint.mode.agentProxy && applicationState.endpoint.mode.provider === 'DOCKER_SWARM_MODE'">
                 <div class="col-sm-12 form-section-title">
                   Deployment
                 </div>
diff --git a/app/docker/views/images/images.html b/app/docker/views/images/images.html
index 8ae9b3f17..4a7c2bc9c 100644
--- a/app/docker/views/images/images.html
+++ b/app/docker/views/images/images.html
@@ -28,7 +28,7 @@
             </div>
           </div>
           <!-- !tag-note -->
-          <div ng-if="applicationState.endpoint.mode.agentProxy">
+          <div ng-if="applicationState.endpoint.mode.agentProxy && applicationState.endpoint.mode.provider === 'DOCKER_SWARM_MODE'">
             <div class="col-sm-12 form-section-title">
               Deployment
             </div>
@@ -57,8 +57,8 @@
     <images-datatable
     title-text="Images" title-icon="fa-clone"
     dataset="images" table-key="images"
-    order-by="RepoTags" 
-    show-host-column="applicationState.endpoint.mode.agentProxy"
+    order-by="RepoTags"
+    show-host-column="applicationState.endpoint.mode.agentProxy && applicationState.endpoint.mode.provider === 'DOCKER_SWARM_MODE'"
     remove-action="removeAction"
     force-remove-action="confirmRemovalAction"
     ></images-datatable>
diff --git a/app/docker/views/networks/create/createnetwork.html b/app/docker/views/networks/create/createnetwork.html
index 08838fc3a..827f725d3 100644
--- a/app/docker/views/networks/create/createnetwork.html
+++ b/app/docker/views/networks/create/createnetwork.html
@@ -119,7 +119,7 @@
             </div>
           </div>
           <!-- !internal -->
-          <div ng-if="applicationState.endpoint.mode.agentProxy && config.Driver !== 'overlay'">
+          <div ng-if="applicationState.endpoint.mode.agentProxy && applicationState.endpoint.mode.provider === 'DOCKER_SWARM_MODE' && config.Driver !== 'overlay'">
             <div class="col-sm-12 form-section-title">
               Deployment
             </div>
diff --git a/app/docker/views/networks/networks.html b/app/docker/views/networks/networks.html
index 318eac9d4..ff0f6edd6 100644
--- a/app/docker/views/networks/networks.html
+++ b/app/docker/views/networks/networks.html
@@ -12,10 +12,10 @@
     <networks-datatable
     title-text="Networks" title-icon="fa-sitemap"
     dataset="networks" table-key="networks"
-    order-by="Name" 
+    order-by="Name"
     remove-action="removeAction"
     show-ownership-column="applicationState.application.authentication"
-    show-host-column="applicationState.endpoint.mode.agentProxy"
+    show-host-column="applicationState.endpoint.mode.agentProxy && applicationState.endpoint.mode.provider === 'DOCKER_SWARM_MODE'"
     ></networks-datatable>
   </div>
 </div>
diff --git a/app/docker/views/volumes/create/createvolume.html b/app/docker/views/volumes/create/createvolume.html
index 7a4c0401d..0547eef8a 100644
--- a/app/docker/views/volumes/create/createvolume.html
+++ b/app/docker/views/volumes/create/createvolume.html
@@ -70,7 +70,7 @@
             <storidge-profile-selector storidge-profile="formValues.StoridgeProfile"></storidge-profile-selector>
           </div>
           <!-- storidge -->
-          <div ng-if="applicationState.endpoint.mode.agentProxy && formValues.Driver === 'local'">
+          <div ng-if="applicationState.endpoint.mode.agentProxy && applicationState.endpoint.mode.provider === 'DOCKER_SWARM_MODE' && formValues.Driver === 'local'">
             <div class="col-sm-12 form-section-title">
               Deployment
             </div>
diff --git a/app/docker/views/volumes/volumes.html b/app/docker/views/volumes/volumes.html
index 89376f0c3..072394f45 100644
--- a/app/docker/views/volumes/volumes.html
+++ b/app/docker/views/volumes/volumes.html
@@ -15,7 +15,7 @@
       order-by="Id"
       remove-action="removeAction"
       show-ownership-column="applicationState.application.authentication"
-      show-host-column="applicationState.endpoint.mode.agentProxy"
+      show-host-column="applicationState.endpoint.mode.agentProxy && applicationState.endpoint.mode.provider === 'DOCKER_SWARM_MODE'"
       show-browse-action="applicationState.endpoint.mode.agentProxy"
     ></volumes-datatable>
   </div>
diff --git a/app/portainer/views/stacks/edit/stack.html b/app/portainer/views/stacks/edit/stack.html
index 1a8d3289b..85defd1e2 100644
--- a/app/portainer/views/stacks/edit/stack.html
+++ b/app/portainer/views/stacks/edit/stack.html
@@ -186,7 +186,7 @@
     dataset="services" table-key="stack-services"
     order-by="Name"
     nodes="nodes"
-    agent-proxy="applicationState.endpoint.mode.agentProxy"
+    agent-proxy="applicationState.endpoint.mode.agentProxy && applicationState.endpoint.mode.provider === 'DOCKER_SWARM_MODE'"
     show-ownership-column="false"
     show-update-action="applicationState.endpoint.apiVersion >= 1.25"
     show-task-logs-button="applicationState.endpoint.apiVersion >= 1.30"