diff --git a/app/portainer/components/endpoint-list/endpoint-list-controller.js b/app/portainer/components/endpoint-list/endpoint-list-controller.js
index 2ad7b9359..fdafb9fdb 100644
--- a/app/portainer/components/endpoint-list/endpoint-list-controller.js
+++ b/app/portainer/components/endpoint-list/endpoint-list-controller.js
@@ -1,38 +1,37 @@
 import _ from 'lodash-es';
 
+const ENDPOINTS_POLLING_INTERVAL = 30000; // in ms
+const ENDPOINTS_CACHE_SIZE = 100;
+
 angular.module('portainer.app').controller('EndpointListController', [
   'DatatableService',
   'PaginationService',
-  function EndpointListController(DatatableService, PaginationService) {
+  'Notifications',
+  function EndpointListController(DatatableService, PaginationService, Notifications) {
     this.state = {
-      totalFilteredEndpoints: this.totalCount,
+      totalFilteredEndpoints: null,
       textFilter: '',
       filteredEndpoints: [],
       paginatedItemLimit: '10',
       pageNumber: 1,
       loading: true,
+      pollingTimeout: null,
     };
 
-    this.$onChanges = function (changesObj) {
-      this.handleEndpointsChange(changesObj.endpoints);
-    };
-
-    this.handleEndpointsChange = function (endpoints) {
-      if (!endpoints || !endpoints.currentValue) {
-        return;
-      }
-      this.onTextFilterChange();
-    };
-
-    this.onTextFilterChange = function () {
+    this.onTextFilterChange = function (init = false) {
       this.state.loading = true;
       var filterValue = this.state.textFilter;
       DatatableService.setDataTableTextFilters(this.tableKey, filterValue);
-      if (this.hasBackendPagination()) {
+      if (!init && this.hasBackendPagination()) {
         this.paginationChangedAction();
       } else {
         this.state.filteredEndpoints = frontEndpointFilter(this.endpoints, this.tags, filterValue);
         this.state.loading = false;
+        if (filterValue) {
+          this.state.totalFilteredEndpoints = this.state.filteredEndpoints.length;
+        } else {
+          this.state.totalFilteredEndpoints = this.endpoints.length;
+        }
       }
     };
 
@@ -63,19 +62,53 @@ angular.module('portainer.app').controller('EndpointListController', [
     }
 
     this.hasBackendPagination = function () {
-      return this.totalCount && this.totalCount > 100;
+      return this.totalCount && this.totalCount > ENDPOINTS_CACHE_SIZE;
     };
 
-    this.paginationChangedAction = function () {
-      if (this.hasBackendPagination()) {
+    this.clearPollTimeout = function () {
+      if (this.state.pollingTimeout) {
+        clearTimeout(this.state.pollingTimeout);
+        this.state.pollingTimeout = 0;
+      }
+    };
+
+    this.$onDestory = function () {
+      this.clearPollTimeout();
+    };
+
+    this.getCurrentPage = async function (start, paginatedItemLimit, textFilter, init = false) {
+      try {
+        const { totalCount, endpoints } = await this.retrievePage(start, paginatedItemLimit, textFilter);
+        if (init) {
+          this.totalCount = totalCount;
+          this.endpoints = endpoints;
+          this.onTextFilterChange(init);
+        } else {
+          this.state.filteredEndpoints = endpoints;
+          this.state.totalFilteredEndpoints = totalCount;
+        }
+        this.state.loading = false;
+
+        const hasOfflineEndpoint = endpoints.some((e) => e.Status !== 1);
+        if (hasOfflineEndpoint) {
+          this.state.pollingTimeout = setTimeout(() => this.getCurrentPage(start, paginatedItemLimit, textFilter), ENDPOINTS_POLLING_INTERVAL);
+        }
+      } catch (err) {
+        Notifications.error('Failed loading page data', err);
+      }
+    };
+
+    this.paginationChangedAction = async function (init = false) {
+      this.clearPollTimeout();
+      if (init || this.hasBackendPagination()) {
         this.state.loading = true;
         this.state.filteredEndpoints = [];
         const start = (this.state.pageNumber - 1) * this.state.paginatedItemLimit + 1;
-        this.retrievePage(start, this.state.paginatedItemLimit, this.state.textFilter).then((data) => {
-          this.state.filteredEndpoints = data.endpoints;
-          this.state.totalFilteredEndpoints = data.totalCount;
-          this.state.loading = false;
-        });
+        if (init) {
+          await this.getCurrentPage(start, ENDPOINTS_CACHE_SIZE, null, init);
+        } else {
+          await this.getCurrentPage(start, this.state.paginatedItemLimit, this.state.textFilter);
+        }
       }
     };
 
@@ -96,11 +129,10 @@ angular.module('portainer.app').controller('EndpointListController', [
     this.$onInit = function () {
       var textFilter = DatatableService.getDataTableTextFilters(this.tableKey);
       this.state.paginatedItemLimit = PaginationService.getPaginationLimit(this.tableKey);
-      if (textFilter !== null) {
+      if (textFilter) {
         this.state.textFilter = textFilter;
-      } else {
-        this.paginationChangedAction();
       }
+      this.paginationChangedAction(true);
     };
   },
 ]);
diff --git a/app/portainer/components/endpoint-list/endpoint-list.js b/app/portainer/components/endpoint-list/endpoint-list.js
index 04914d268..0ba2b6078 100644
--- a/app/portainer/components/endpoint-list/endpoint-list.js
+++ b/app/portainer/components/endpoint-list/endpoint-list.js
@@ -4,7 +4,6 @@ angular.module('portainer.app').component('endpointList', {
   bindings: {
     titleText: '@',
     titleIcon: '@',
-    endpoints: '<',
     tags: '<',
     tableKey: '@',
     dashboardAction: '<',
@@ -12,7 +11,6 @@ angular.module('portainer.app').component('endpointList', {
     showSnapshotAction: '<',
     editAction: '<',
     isAdmin: '<',
-    totalCount: '<',
     retrievePage: '<',
     endpointInitTime: '<',
   },
diff --git a/app/portainer/views/home/home.html b/app/portainer/views/home/home.html
index 0f0f0ba78..3e26f3d69 100644
--- a/app/portainer/views/home/home.html
+++ b/app/portainer/views/home/home.html
@@ -48,7 +48,6 @@
     <endpoint-list
       title-text="Environments"
       title-icon="fa-plug"
-      endpoints="endpoints"
       table-key="home_endpoints"
       tags="tags"
       dashboard-action="goToDashboard"
@@ -56,7 +55,6 @@
       snapshot-action="triggerSnapshot"
       edit-action="goToEdit"
       is-admin="isAdmin"
-      total-count="totalCount"
       retrieve-page="getPaginatedEndpoints"
       endpoint-init-time="state.homepageLoadTime"
     ></endpoint-list>
diff --git a/app/portainer/views/home/homeController.js b/app/portainer/views/home/homeController.js
index 9fae5b1b6..f3660a70b 100644
--- a/app/portainer/views/home/homeController.js
+++ b/app/portainer/views/home/homeController.js
@@ -101,15 +101,8 @@ angular
       });
 
       try {
-        const [{ totalCount, endpoints }, tags] = await Promise.all([getPaginatedEndpoints(0, 100), TagService.tags()]);
+        const tags = TagService.tags();
         $scope.tags = tags;
-
-        $scope.totalCount = totalCount;
-        if (totalCount > 100) {
-          $scope.endpoints = [];
-        } else {
-          $scope.endpoints = endpoints;
-        }
       } catch (err) {
         Notifications.error('Failed loading page data', err);
       }