diff --git a/pcbnew/dialogs/dialog_drc.cpp b/pcbnew/dialogs/dialog_drc.cpp
index d13e43f982..8915454ec1 100644
--- a/pcbnew/dialogs/dialog_drc.cpp
+++ b/pcbnew/dialogs/dialog_drc.cpp
@@ -92,7 +92,8 @@ DIALOG_DRC::~DIALOG_DRC()
 
     PCBNEW_SETTINGS* settings = m_brdEditor->GetPcbNewSettings();
     settings->m_DrcDialog.refill_zones       = m_cbRefillZones->GetValue();
-    settings->m_DrcDialog.test_track_to_zone = m_cbReportAllTrackErrors->GetValue();
+    settings->m_DrcDialog.test_track_to_zone = m_cbReportTracksToZonesErrors->GetValue();
+    settings->m_DrcDialog.test_all_track_errors = m_cbReportAllTrackErrors->GetValue();
     settings->m_DrcDialog.test_footprints    = m_cbTestFootprints->GetValue();
     settings->m_DrcDialog.severities         = m_severities;
 
@@ -144,7 +145,8 @@ void DIALOG_DRC::initValues()
     auto cfg = m_brdEditor->GetPcbNewSettings();
 
     m_cbRefillZones->SetValue( cfg->m_DrcDialog.refill_zones );
-    m_cbReportAllTrackErrors->SetValue( cfg->m_DrcDialog.test_track_to_zone );
+    m_cbReportTracksToZonesErrors->SetValue( cfg->m_DrcDialog.test_track_to_zone );
+    m_cbReportAllTrackErrors->SetValue( cfg->m_DrcDialog.test_all_track_errors );
     m_cbTestFootprints->SetValue( cfg->m_DrcDialog.test_footprints );
 
     m_severities = cfg->m_DrcDialog.severities;
diff --git a/pcbnew/pcbnew_settings.cpp b/pcbnew/pcbnew_settings.cpp
index c69994d51c..25cd648a04 100644
--- a/pcbnew/pcbnew_settings.cpp
+++ b/pcbnew/pcbnew_settings.cpp
@@ -212,6 +212,9 @@ PCBNEW_SETTINGS::PCBNEW_SETTINGS()
     m_params.emplace_back( new PARAM<bool>( "drc_dialog.test_track_to_zone",
             &m_DrcDialog.test_track_to_zone, false ) );
 
+    m_params.emplace_back( new PARAM<bool>( "drc_dialog.test_all_track_errors",
+            &m_DrcDialog.test_all_track_errors, false ) );
+
     m_params.emplace_back( new PARAM<bool>( "drc_dialog.test_footprints",
             &m_DrcDialog.test_footprints, false ) );
 
diff --git a/pcbnew/pcbnew_settings.h b/pcbnew/pcbnew_settings.h
index ac482e5420..fc0ab4cfce 100644
--- a/pcbnew/pcbnew_settings.h
+++ b/pcbnew/pcbnew_settings.h
@@ -87,6 +87,7 @@ public:
     {
         bool refill_zones;
         bool test_track_to_zone;
+        bool test_all_track_errors;
         bool test_footprints;
         int  severities;
     };