diff --git a/src/switch_core_session.c b/src/switch_core_session.c
index c2fb0ea8d6..74dae6e68a 100644
--- a/src/switch_core_session.c
+++ b/src/switch_core_session.c
@@ -1688,6 +1688,12 @@ static void *SWITCH_THREAD_FUNC switch_core_session_thread_pool_manager(switch_t
 
 		check_queue();
 	}
+
+	while(session_manager.running) {
+		switch_queue_trypush(session_manager.thread_queue, NULL);
+		switch_yield(20000);
+	}
+
 	
 	return NULL;
 }