diff --git a/pcbnew/connectivity/connectivity_data.cpp b/pcbnew/connectivity/connectivity_data.cpp
index 3348de0ade..f71d9a1fa9 100644
--- a/pcbnew/connectivity/connectivity_data.cpp
+++ b/pcbnew/connectivity/connectivity_data.cpp
@@ -662,11 +662,6 @@ const std::vector<CN_EDGE> CONNECTIVITY_DATA::GetRatsnestForItems( std::vector<B
 
     for( auto item : aItems )
     {
-        auto conn_item = dyn_cast<BOARD_CONNECTED_ITEM*>( item );
-
-        if( !conn_item )
-            continue;
-
         if( item->Type() == PCB_MODULE_T )
         {
             auto component = static_cast<MODULE*>( item );
@@ -677,7 +672,7 @@ const std::vector<CN_EDGE> CONNECTIVITY_DATA::GetRatsnestForItems( std::vector<B
                 item_set.insert( pad );
             }
         }
-        else
+        else if( auto conn_item = dyn_cast<BOARD_CONNECTED_ITEM*>( item ) )
         {
             item_set.insert( conn_item );
             nets.insert( conn_item->GetNetCode() );