diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp
index 83dd5f248..ab874c4b7 100644
--- a/src/zapit/src/zapit.cpp
+++ b/src/zapit/src/zapit.cpp
@@ -2155,6 +2155,13 @@ void CZapit::run()
 		ca->Stop();
 		delete ca;
 	}
+#ifdef EXIT_CLEANUP
+	INFO("cleanup...");
+	delete eventServer;
+	delete g_bouquetManager;
+	delete CServiceManager::getInstance();
+	delete CServiceScan::getInstance();
+#endif
 	INFO("shutdown complete");
 	return;
 }