diff --git a/src/pages/chat/index.tsx b/src/pages/chat/index.tsx
index 4367e53..7ee65b6 100644
--- a/src/pages/chat/index.tsx
+++ b/src/pages/chat/index.tsx
@@ -569,7 +569,9 @@ export default function ChatConversationPage({
 					return {
 						sessionId: nextSessionId,
 						configOptions: attached.configOptions,
-						availableCommands: attached.availableCommands,
+						availableCommands: attached.availableCommands.length
+							? attached.availableCommands
+							: result.availableCommands,
 						messages: attached.messages,
 						revision: attached.revision,
 						syncing: attached.syncing,
@@ -1356,7 +1358,9 @@ export default function ChatConversationPage({
 						return {
 							sessionId: nextSessionId,
 							configOptions: attached.configOptions,
-							availableCommands: attached.availableCommands,
+							availableCommands: attached.availableCommands.length
+								? attached.availableCommands
+								: result.availableCommands,
 							messages: attached.messages,
 							revision: attached.revision,
 							syncing: attached.syncing,