diff --git a/src/WSEvents.cpp b/src/WSEvents.cpp
index 15a15326..98169f2c 100644
--- a/src/WSEvents.cpp
+++ b/src/WSEvents.cpp
@@ -134,8 +134,6 @@ WSEvents::~WSEvents() {
 
 	obs_frontend_remove_event_callback(WSEvents::FrontendEventHandler, this);
 	os_cpu_usage_info_destroy(cpuUsageInfo);
-
-	blog(LOG_INFO, "wsevents destroyed");
 }
 
 void WSEvents::FrontendEventHandler(enum obs_frontend_event event, void* private_data) {
diff --git a/src/obs-websocket.cpp b/src/obs-websocket.cpp
index e2eefd7b..924f83cc 100644
--- a/src/obs-websocket.cpp
+++ b/src/obs-websocket.cpp
@@ -83,6 +83,11 @@ bool obs_module_load(void) {
 
 void obs_module_unload() {
 	_server->stop();
+
+	_eventsSystem.reset();
+	_server.reset();
+	_config.reset();
+
 	blog(LOG_INFO, "goodbye!");
 }