diff --git a/pcbnew/board_design_settings.cpp b/pcbnew/board_design_settings.cpp
index 3df1de5376..2d36bcff7a 100644
--- a/pcbnew/board_design_settings.cpp
+++ b/pcbnew/board_design_settings.cpp
@@ -1028,9 +1028,12 @@ bool BOARD_DESIGN_SETTINGS::Ignore( int aDRCErrorCode )
 
 int BOARD_DESIGN_SETTINGS::GetBiggestClearanceValue() const
 {
-    int            biggest = 0;
+    int            biggest = std::max( m_MinClearance, m_HoleClearance );
     DRC_CONSTRAINT constraint;
 
+    biggest = std::max( biggest, m_HoleToHoleMin );
+    biggest = std::max( biggest, m_CopperEdgeClearance );
+
     if( m_DRCEngine )
     {
         m_DRCEngine->QueryWorstConstraint( CLEARANCE_CONSTRAINT, constraint );