diff --git a/pcbnew/router/pns_kicad_iface.cpp b/pcbnew/router/pns_kicad_iface.cpp
index 6a3432fead..fb3afa8196 100644
--- a/pcbnew/router/pns_kicad_iface.cpp
+++ b/pcbnew/router/pns_kicad_iface.cpp
@@ -618,9 +618,12 @@ std::unique_ptr<PNS::SOLID> PNS_KICAD_IFACE_BASE::syncPad( D_PAD* aPad )
 
     std::unique_ptr< PNS::SOLID > solid( new PNS::SOLID );
 
-    if( aPad->GetAttribute() == PAD_ATTRIB_STANDARD )
+    if( aPad->GetAttribute() == PAD_ATTRIB_STANDARD || PAD_ATTRIB_HOLE_NOT_PLATED )
         solid->SetAlternateShape( aPad->GetEffectiveHoleShape()->Clone() );
 
+    if( aPad->GetAttribute() == PAD_ATTRIB_HOLE_NOT_PLATED )
+        solid->SetRoutable( false );
+
     solid->SetLayers( layers );
     solid->SetNet( aPad->GetNetCode() );
     solid->SetParent( aPad );