diff --git a/src/renderer/components/cluster-manager/cluster-status.tsx b/src/renderer/components/cluster-manager/cluster-status.tsx
index e2e002c8b7..ecc6f2c7e7 100644
--- a/src/renderer/components/cluster-manager/cluster-status.tsx
+++ b/src/renderer/components/cluster-manager/cluster-status.tsx
@@ -55,6 +55,13 @@ export class ClusterStatus extends React.Component<ClusterStatusProps> {
     ]);
   }
 
+  componentDidUpdate(prevProps: Readonly<ClusterStatusProps>): void {
+    if (prevProps.cluster.id !== this.props.cluster.id) {
+      this.isReconnecting = false;
+      this.authOutput = [];
+    }
+  }
+
   reconnect = async () => {
     this.authOutput = [];
     this.isReconnecting = true;