diff --git a/eeschema/connection_graph.cpp b/eeschema/connection_graph.cpp
index bffaf2d14d..17bdc226a4 100644
--- a/eeschema/connection_graph.cpp
+++ b/eeschema/connection_graph.cpp
@@ -439,10 +439,13 @@ void CONNECTION_GRAPH::updateItemConnectivity( SCH_SHEET_PATH aSheet,
             SCH_COMPONENT* component = static_cast<SCH_COMPONENT*>( item );
             TRANSFORM t = component->GetTransform();
 
-            component->UpdatePins( &aSheet );
+            // Assumption: we don't need to call UpdatePins() here because anything
+            // that would change the pins of the component will have called it already
 
             for( SCH_PIN& pin : component->GetPins() )
             {
+                pin.InitializeConnection( aSheet );
+
                 wxPoint pos = t.TransformCoordinate( pin.GetPosition() ) + component->GetPosition();
 
                 // because calling the first time is not thread-safe