diff --git a/app/portainer/services/endpointProvider.ts b/app/portainer/services/endpointProvider.ts
index 45636ce01..a6ea611d7 100644
--- a/app/portainer/services/endpointProvider.ts
+++ b/app/portainer/services/endpointProvider.ts
@@ -33,6 +33,13 @@ export function EndpointProvider() {
     if (endpoint && endpoint.Type === EnvironmentType.EdgeAgentOnDocker) {
       state.pingInterval = setInterval(() => ping(endpoint.Id), 60 * 1000);
     }
+
+    if (endpoint === null) {
+      sessionStorage.setItem(
+        'portainer.environmentId',
+        JSON.stringify(undefined)
+      );
+    }
   }
 
   function currentEndpoint() {
diff --git a/app/portainer/views/endpoints/endpointsController.js b/app/portainer/views/endpoints/endpointsController.js
index 07f09ed62..f18c44c22 100644
--- a/app/portainer/views/endpoints/endpointsController.js
+++ b/app/portainer/views/endpoints/endpointsController.js
@@ -46,8 +46,6 @@ export class EndpointsController {
         // If the current endpoint was deleted, then clean endpoint store
         if (endpoints.some((e) => e.Id === id)) {
           this.StateManager.cleanEndpoint();
-          // trigger sidebar rerender
-          this.applicationState.endpoint = {};
         }
 
         this.$state.reload();