diff --git a/OMEdit/OMEditLIB/Element/Element.cpp b/OMEdit/OMEditLIB/Element/Element.cpp
index c8e082f8233..91c7d2f97b5 100644
--- a/OMEdit/OMEditLIB/Element/Element.cpp
+++ b/OMEdit/OMEditLIB/Element/Element.cpp
@@ -2266,6 +2266,11 @@ void Element::reDrawConnector(QPainter *painter)
     painter->restore();
   }
 
+  // Skip when condition is false
+  if (!isCondition()) {
+    return;
+  }
+
   foreach (Element *pInheritedElement, mInheritedElementsList) {
     pInheritedElement->reDrawConnector(painter);
   }