diff --git a/plugin/src/software/aws/toolkits/eclipse/amazonq/lsp/manager/LspStatusManager.java b/plugin/src/software/aws/toolkits/eclipse/amazonq/lsp/manager/LspStatusManager.java
index fa8c6c80..80aaf0d4 100644
--- a/plugin/src/software/aws/toolkits/eclipse/amazonq/lsp/manager/LspStatusManager.java
+++ b/plugin/src/software/aws/toolkits/eclipse/amazonq/lsp/manager/LspStatusManager.java
@@ -39,10 +39,10 @@ public void setToFailed() {
         if (lspState != LspState.FAILED) {
             ViewVisibilityManager.showLspStartUpFailedView("update");
             lspState = LspState.FAILED;
+            Activator.getEventBroker().post(lspState);
         }
-
-        Activator.getEventBroker().post(lspState);
     }
+
     public LspState getLspState() {
         return lspState;
     }
diff --git a/plugin/src/software/aws/toolkits/eclipse/amazonq/views/ViewVisibilityManager.java b/plugin/src/software/aws/toolkits/eclipse/amazonq/views/ViewVisibilityManager.java
index 7d8f3e25..4f6d8656 100644
--- a/plugin/src/software/aws/toolkits/eclipse/amazonq/views/ViewVisibilityManager.java
+++ b/plugin/src/software/aws/toolkits/eclipse/amazonq/views/ViewVisibilityManager.java
@@ -39,7 +39,10 @@ private ViewVisibilityManager() {
     );
 
     public static void showDefaultView(final String source) {
-        if (Activator.getLoginService().getAuthState().isLoggedIn()) {
+        var authState = Activator.getLoginService().getAuthState();
+        if (authState.isExpired()) {
+            showReAuthView(source);
+        } else if (authState.isLoggedIn()) {
             showChatView(source);
         } else {
             showLoginView(source);