diff --git a/src/fetcher.cc b/src/fetcher.cc
index 3334040..be9064a 100644
--- a/src/fetcher.cc
+++ b/src/fetcher.cc
@@ -51,6 +51,7 @@
   , m_finishCallback (finishCallback)
 
   , m_active (false)
+  , m_timedwait (false)
   , m_name (name)
   , m_deviceName (deviceName)
   , m_forwardingHint (forwardingHint)
@@ -201,6 +202,7 @@
       // using executor, so we won't be deleted if there is scheduled FillPipeline call
       if (!m_onFetchComplete.empty ())
         {
+          m_timedwait = true;
           m_executor->execute (bind (m_onFetchComplete, ref(*this), m_deviceName, m_name));
         }
     }