diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt
index 6670018c17b..607ce002d64 100644
--- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt
+++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt
@@ -97,13 +97,6 @@ class BrowserConnector(
             .onEach { json ->
                 val node = serializer.toNode(json)
                 when (node.command) {
-                    "ui-is-ready" -> {
-                        uiReady.complete(true)
-                        RunOnceUtil.runOnceForApp("AmazonQ-UI-Ready") {
-                            MeetQSettings.getInstance().reinvent2024OnboardingCount += 1
-                        }
-                    }
-
                     "disclaimer-acknowledged" -> {
                         MeetQSettings.getInstance().disclaimerAcknowledged = true
                     }
@@ -245,6 +238,10 @@ class BrowserConnector(
             }
             CHAT_READY -> {
                 handleChatNotification<ChatReadyNotification, Unit>(node) { server, _ ->
+                    uiReady.complete(true)
+                    RunOnceUtil.runOnceForApp("AmazonQ-UI-Ready") {
+                        MeetQSettings.getInstance().reinvent2024OnboardingCount += 1
+                    }
                     server.chatReady()
                 }
             }