diff --git a/web/containers/Providers/EventHandler.tsx b/web/containers/Providers/EventHandler.tsx
index 5cc92219c..72d35aad3 100644
--- a/web/containers/Providers/EventHandler.tsx
+++ b/web/containers/Providers/EventHandler.tsx
@@ -179,6 +179,9 @@ export default function EventHandler({ children }: { children: ReactNode }) {
           setIsGeneratingResponse(false)
         }
         return
+      } else if (message.status === MessageStatus.Error) {
+        setActiveModel(undefined)
+        setStateModel({ state: 'start', loading: false, model: undefined })
       }
       // Mark the thread as not waiting for response
       updateThreadWaiting(message.thread_id, false)
diff --git a/web/hooks/useActiveModel.ts b/web/hooks/useActiveModel.ts
index 353288337..7b9ee98e0 100644
--- a/web/hooks/useActiveModel.ts
+++ b/web/hooks/useActiveModel.ts
@@ -53,7 +53,7 @@ export function useActiveModel() {
     }
 
     if (activeModel) {
-      stopModel(activeModel)
+      await stopModel(activeModel)
     }
     setPendingModelLoad(true)