diff --git a/src/frontend/misccoms.c b/src/frontend/misccoms.c
index 68bcf39a0..585d3d7fb 100644
--- a/src/frontend/misccoms.c
+++ b/src/frontend/misccoms.c
@@ -101,7 +101,12 @@ com_quit(wordlist *wl)
     destroy_const_plot();
     spice_destroy_devices();
 #endif
+#ifdef SHARED_MODULE
+    /* add 1000 to notify that we exit from 'quit' */
+    controlled_exit(1000 + exitcode);
+#else
     exit(exitcode);
+#endif
 }