diff --git a/client/src/components/GalaxyAI.vue b/client/src/components/GalaxyAI.vue
index e52012848b0..cac358d61b6 100644
--- a/client/src/components/GalaxyAI.vue
+++ b/client/src/components/GalaxyAI.vue
@@ -281,12 +281,13 @@ async function fetchConversation(exchangeId: string) {
         },
     });
 
-    if (!fullConversation || fullConversation.length === 0) {
-        return;
-    } else if (error) {
+    if (error) {
         Toast.error(errorMessageAsString(error, "Failed to load conversation."), "Error loading conversation");
         return;
     }
+    if (!fullConversation || fullConversation.length === 0) {
+        return;
+    }
 
     messages.value = fullConversation.map((msg: any, index: number) => {
         const message: ChatMessage = {