diff --git a/src/thread_main.cc b/src/thread_main.cc
index ca3599cf..97ed84d5 100644
--- a/src/thread_main.cc
+++ b/src/thread_main.cc
@@ -50,6 +50,7 @@ ThreadMain::init_thread() {
   acquire_global_lock();
 
   m_pollManager = core::PollManager::create_poll_manager();
+  m_pollManager->get_torrent_poll()->set_flags(torrent::Poll::flag_waive_global_lock);
 
   m_state = STATE_INITIALIZED;
 }