diff --git a/src/misc/pv/timer.h b/src/misc/pv/timer.h
index bc82c1a..3cc6277 100644
--- a/src/misc/pv/timer.h
+++ b/src/misc/pv/timer.h
@@ -123,7 +123,6 @@ private:
     TimerCallbackPtr head;
     Mutex mutex;
     Event waitForWork;
-    Event waitForDone;
     bool alive;
     Thread thread;
 };
diff --git a/src/misc/timer.cpp b/src/misc/timer.cpp
index a2d3f8c..0d197db 100644
--- a/src/misc/timer.cpp
+++ b/src/misc/timer.cpp
@@ -32,7 +32,6 @@ TimerCallback::TimerCallback()
 
 Timer::Timer(string threadName,ThreadPriority priority)
 : waitForWork(false),
-  waitForDone(false),
   alive(true),
   thread(threadName,priority,this)
 {}
@@ -139,7 +138,6 @@ void Timer::run()
              waitForWork.wait(delay);
          }
     } 
-    waitForDone.signal();
 }
 
 Timer::~Timer() {
@@ -148,7 +146,7 @@ Timer::~Timer() {
          alive = false;
     }
     waitForWork.signal();
-    waitForDone.wait();
+    thread.exitWait();
     TimerCallbackPtr timerCallback;
     while(true) {
         timerCallback = head;