diff --git a/.changes/next-release/bugfix-f290302a-3c37-4982-ad78-11f0b413c694.json b/.changes/next-release/bugfix-f290302a-3c37-4982-ad78-11f0b413c694.json
new file mode 100644
index 0000000000..958a4389e3
--- /dev/null
+++ b/.changes/next-release/bugfix-f290302a-3c37-4982-ad78-11f0b413c694.json
@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Fix chat not retaining history when interaction is through onboarding tab type (#5189)"
+}
\ No newline at end of file
diff --git a/plugins/amazonq/mynah-ui/src/mynah-ui/ui/storages/tabsStorage.ts b/plugins/amazonq/mynah-ui/src/mynah-ui/ui/storages/tabsStorage.ts
index bf40b1e530..6b36eae684 100644
--- a/plugins/amazonq/mynah-ui/src/mynah-ui/ui/storages/tabsStorage.ts
+++ b/plugins/amazonq/mynah-ui/src/mynah-ui/ui/storages/tabsStorage.ts
@@ -104,7 +104,10 @@ export class TabsStorage {
 
     public updateTabTypeFromUnknown(tabID: string, tabType: TabType) {
         const currentTabValue = this.tabs.get(tabID)
-        if (currentTabValue === undefined || currentTabValue.type !== 'unknown') {
+        if (
+            currentTabValue === undefined ||
+            (currentTabValue.type !== 'unknown' && currentTabValue.type !== 'welcome')
+        ) {
             return
         }