diff --git a/src/Mod/Sketcher/App/SketchObject.cpp b/src/Mod/Sketcher/App/SketchObject.cpp
index 7963fb3eb7..e33fc25ef5 100644
--- a/src/Mod/Sketcher/App/SketchObject.cpp
+++ b/src/Mod/Sketcher/App/SketchObject.cpp
@@ -7618,8 +7618,10 @@ void SketchObject::synchroniseGeometryState()
         bool constraintBlockedState = false;
 
         for (auto cstr : Constraints.getValues()) {
-            getInternalTypeState(cstr, constraintInternalAlignment);
-            getBlockedState(cstr, constraintBlockedState);
+            if(cstr->First == int(i)) {
+                getInternalTypeState(cstr, constraintInternalAlignment);
+                getBlockedState(cstr, constraintBlockedState);
+            }
         }
 
         if(constraintInternalAlignment != facadeInternalAlignment)