diff --git a/lib/base/timer.cpp b/lib/base/timer.cpp
index dd3d68b4c..89cb3d79f 100644
--- a/lib/base/timer.cpp
+++ b/lib/base/timer.cpp
@@ -57,7 +57,7 @@ Timer::Timer(void)
  */
 Timer::~Timer(void)
 {
-	Stop();
+	Stop(true);
 }
 
 /**
diff --git a/lib/base/workqueue.cpp b/lib/base/workqueue.cpp
index a09928e57..c3259309a 100644
--- a/lib/base/workqueue.cpp
+++ b/lib/base/workqueue.cpp
@@ -44,7 +44,7 @@ WorkQueue::WorkQueue(size_t maxItems, int threadCount)
 
 WorkQueue::~WorkQueue(void)
 {
-	m_StatusTimer->Stop();
+	m_StatusTimer->Stop(true);
 
 	Join(true);
 }