diff --git a/common/api/api_server.cpp b/common/api/api_server.cpp
index 0d02ce0b1f..e0b34354a3 100644
--- a/common/api/api_server.cpp
+++ b/common/api/api_server.cpp
@@ -63,6 +63,7 @@ KICAD_API_SERVER::KICAD_API_SERVER() :
 
 KICAD_API_SERVER::~KICAD_API_SERVER()
 {
+    Stop();
 }