diff --git a/src/hooks/useSelectedModelSchema.ts b/src/hooks/useSelectedModelSchema.ts
index 2457f44c..b97dff6e 100644
--- a/src/hooks/useSelectedModelSchema.ts
+++ b/src/hooks/useSelectedModelSchema.ts
@@ -103,7 +103,13 @@ export function useSelectedModelSchema({
       });
 
     return () => {
-      controller.abort();
+      if (abortRef.current === controller) {
+        controller.abort();
+        abortRef.current = null;
+        requestKeyRef.current = null;
+      } else {
+        controller.abort();
+      }
     };
   }, [
     enabled,