diff --git a/common/pgm_base.cpp b/common/pgm_base.cpp
index 75e42c50e7..e103c6fd7a 100644
--- a/common/pgm_base.cpp
+++ b/common/pgm_base.cpp
@@ -626,7 +626,8 @@ bool PGM_BASE::InitPgm( bool aHeadless, bool aSkipPyInit, bool aIsUnitTest )
     GetSettingsManager().LoadProject( "" );
 
 #ifdef KICAD_IPC_API
-    m_plugin_manager->ReloadPlugins();
+    if( commonSettings->m_Api.enable_server )
+        m_plugin_manager->ReloadPlugins();
 #endif
 
     // This sets the maximum tooltip display duration to 10s (up from 5) but only affects
diff --git a/eeschema/tools/sch_editor_control.cpp b/eeschema/tools/sch_editor_control.cpp
index e0c5e622a6..df0bbf8347 100644
--- a/eeschema/tools/sch_editor_control.cpp
+++ b/eeschema/tools/sch_editor_control.cpp
@@ -2745,7 +2745,8 @@ int SCH_EDITOR_CONTROL::TogglePythonConsole( const TOOL_EVENT& aEvent )
 int SCH_EDITOR_CONTROL::ReloadPlugins( const TOOL_EVENT& aEvent )
 {
 #ifdef KICAD_IPC_API
-    Pgm().GetPluginManager().ReloadPlugins();
+    if( Pgm().GetCommonSettings()->m_Api.enable_server )
+        Pgm().GetPluginManager().ReloadPlugins();
 #endif
     return 0;
 }
diff --git a/pcbnew/python/scripting/pcb_scripting_tool.cpp b/pcbnew/python/scripting/pcb_scripting_tool.cpp
index 25186ee09e..baca3a12cb 100644
--- a/pcbnew/python/scripting/pcb_scripting_tool.cpp
+++ b/pcbnew/python/scripting/pcb_scripting_tool.cpp
@@ -113,7 +113,8 @@ int SCRIPTING_TOOL::reloadPlugins( const TOOL_EVENT& aEvent )
 
 #ifdef KICAD_IPC_API
     // TODO move this elsewhere when SWIG plugins are removed
-    Pgm().GetPluginManager().ReloadPlugins();
+    if( Pgm().GetCommonSettings()->m_Api.enable_server )
+        Pgm().GetPluginManager().ReloadPlugins();
 #endif
 
     if( !m_isFootprintEditor )