diff --git a/src/CqlBuilderPanel/CqlBuilderPanel.tsx b/src/CqlBuilderPanel/CqlBuilderPanel.tsx
index 6866b53b..ac98e4d1 100644
--- a/src/CqlBuilderPanel/CqlBuilderPanel.tsx
+++ b/src/CqlBuilderPanel/CqlBuilderPanel.tsx
@@ -128,6 +128,8 @@ export default function CqlBuilderPanel({
             setLoading(false);
           });
       }
+    } else {
+      setLoading(false);
     }
   }, [measureModel, measureStoreCql]);