diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp
index 8eade5cef..2fc658f2f 100644
--- a/src/zapit/src/zapit.cpp
+++ b/src/zapit/src/zapit.cpp
@@ -2049,6 +2049,8 @@ bool CZapit::Start(Z_start_arg *ZapStart_arg)
 
 bool CZapit::Stop()
 {
+	if(!started)
+		return false;
 	started = false;
 	int ret = join();
 	return (ret == 0);