diff --git a/common/dialogs/panel_setup_severities.cpp b/common/dialogs/panel_setup_severities.cpp
index 79092b8d2c..ae9e3ec69f 100644
--- a/common/dialogs/panel_setup_severities.cpp
+++ b/common/dialogs/panel_setup_severities.cpp
@@ -205,6 +205,9 @@ bool PANEL_SETUP_SEVERITIES::TransferDataFromWindow()
     {
         int errorCode = item.GetErrorCode();
 
+        if( m_pinMapSpecialCase && m_pinMapSpecialCase->GetErrorCode() == errorCode )
+            continue;
+
         if( !m_buttonMap[ errorCode ][0] )  // this entry does not actually exist
             continue;
 
diff --git a/eeschema/erc_settings.cpp b/eeschema/erc_settings.cpp
index 04a422aae5..d606f8d1ce 100644
--- a/eeschema/erc_settings.cpp
+++ b/eeschema/erc_settings.cpp
@@ -97,6 +97,8 @@ ERC_SETTINGS::ERC_SETTINGS( JSON_SETTINGS* aParent, const std::string& aPath ) :
     m_Severities[ERCE_DRIVER_CONFLICT]         = RPT_SEVERITY_WARNING;
     m_Severities[ERCE_BUS_ENTRY_CONFLICT]      = RPT_SEVERITY_WARNING;
     m_Severities[ERCE_LIB_SYMBOL_ISSUES]       = RPT_SEVERITY_WARNING;
+    m_Severities[ERCE_NOCONNECT_CONNECTED]     = RPT_SEVERITY_WARNING;
+    m_Severities[ERCE_NOCONNECT_NOT_CONNECTED] = RPT_SEVERITY_WARNING;
 
     m_params.emplace_back( new PARAM_LAMBDA<nlohmann::json>( "rule_severities",
             [&]() -> nlohmann::json