diff --git a/sourcepawn/jit/engine2.cpp b/sourcepawn/jit/engine2.cpp
index 840367a0..5c4d9d53 100644
--- a/sourcepawn/jit/engine2.cpp
+++ b/sourcepawn/jit/engine2.cpp
@@ -192,6 +192,7 @@ bool SourcePawnEngine2::Initialize()
 
 void SourcePawnEngine2::Shutdown()
 {
+	g_WatchdogTimer.Shutdown();
 	g_Jit.ShutdownJIT();
 }
 
diff --git a/sourcepawn/jit/watchdog_timer.cpp b/sourcepawn/jit/watchdog_timer.cpp
index 64e52beb..eb70c6ee 100644
--- a/sourcepawn/jit/watchdog_timer.cpp
+++ b/sourcepawn/jit/watchdog_timer.cpp
@@ -31,7 +31,7 @@ WatchdogTimer::WatchdogTimer()
 
 WatchdogTimer::~WatchdogTimer()
 {
-  Shutdown();
+  assert(!thread_);
 }
 
 bool