diff --git a/app/docker/views/host/host-view-controller.js b/app/docker/views/host/host-view-controller.js
index b9b8ec010..d21bed1c8 100644
--- a/app/docker/views/host/host-view-controller.js
+++ b/app/docker/views/host/host-view-controller.js
@@ -43,7 +43,7 @@ angular.module('portainer.docker').controller('HostViewController', [
           ctrl.state.offlineMode = isOfflineEndpoint(ctrl.endpoint);
           ctrl.jobs = data.jobs;
 
-          if (ctrl.state.isAgent && agentApiVersion > 1) {
+          if (ctrl.state.isAgent && agentApiVersion > 1 && ctrl.state.enableHostManagementFeatures) {
             return AgentService.hostInfo(data.info.Hostname).then(function onHostInfoLoad(agentHostInfo) {
               ctrl.devices = agentHostInfo.PCIDevices;
               ctrl.disks = agentHostInfo.PhysicalDisks;
diff --git a/app/docker/views/nodes/node-details/node-details-view-controller.js b/app/docker/views/nodes/node-details/node-details-view-controller.js
index bed849412..c7e1b3478 100644
--- a/app/docker/views/nodes/node-details/node-details-view-controller.js
+++ b/app/docker/views/nodes/node-details/node-details-view-controller.js
@@ -38,7 +38,7 @@ angular.module('portainer.docker').controller('NodeDetailsViewController', [
         if (ctrl.state.isAgent) {
           var agentApiVersion = applicationState.endpoint.agentApiVersion;
           ctrl.state.agentApiVersion = agentApiVersion;
-          if (agentApiVersion < 2) {
+          if (agentApiVersion < 2 || !ctrl.state.enableHostManagementFeatures) {
             return;
           }