diff --git a/pcbnew/board_design_settings.cpp b/pcbnew/board_design_settings.cpp
index 3bec219a04..ac7c8a061d 100644
--- a/pcbnew/board_design_settings.cpp
+++ b/pcbnew/board_design_settings.cpp
@@ -1554,4 +1554,9 @@ void BOARD_DESIGN_SETTINGS::SetDefaultMasterPad()
 
     constexpr double RR_RADIUS = DEFAULT_PAD_HEIGTH_MM * DEFAULT_PAD_RR_RADIUS_RATIO;
     m_Pad_Master->SetRoundRectCornerRadius( PADSTACK::ALL_LAYERS, pcbIUScale.mmToIU( RR_RADIUS ) );
+
+    if( m_Pad_Master->GetFrontShape() == PAD_SHAPE::CIRCLE )
+        m_Pad_Master->SetThermalSpokeAngle( ANGLE_45 );
+    else
+        m_Pad_Master->SetThermalSpokeAngle( ANGLE_90 );
 }