diff --git a/src/frontend/src/components/chatComponent/buildTrigger/index.tsx b/src/frontend/src/components/chatComponent/buildTrigger/index.tsx
index 4eb69546e..9b0b74678 100644
--- a/src/frontend/src/components/chatComponent/buildTrigger/index.tsx
+++ b/src/frontend/src/components/chatComponent/buildTrigger/index.tsx
@@ -82,13 +82,15 @@ export default function BuildTrigger({
       const parsedData = JSON.parse(event.data);
       // if the event is the end of the stream, close the connection
       if (parsedData.end_of_stream) {
+        // Close the connection and finish
+        finished = true;
         eventSource.close();
 
         return;
       } else if (parsedData.log) {
         // If the event is a log, log it
         setSuccessData({ title: parsedData.log });
-      } else if (parsedData.input_keys) {
+      } else if (parsedData.input_keys !== undefined) {
         setTabsState((old) => {
           return {
             ...old,