diff --git a/pcbnew/drc/drc_creepage_utils.cpp b/pcbnew/drc/drc_creepage_utils.cpp
index fc0285913a..4d6e7da95d 100644
--- a/pcbnew/drc/drc_creepage_utils.cpp
+++ b/pcbnew/drc/drc_creepage_utils.cpp
@@ -2560,7 +2560,7 @@ std::shared_ptr<GRAPH_NODE> CREEPAGE_GRAPH::AddNetElements( int aNetCode, PCB_LA
     {
         for( PAD* pad : footprint->Pads() )
         {
-            if( pad->GetNetCode() != aNetCode )
+            if( pad->GetNetCode() != aNetCode || !pad->GetLayerSet().test( aLayer ) )
                 continue;
 
             std::shared_ptr<SHAPE> padShape = pad->GetEffectiveShape( aLayer );