diff --git a/src/driver/streamts.cpp b/src/driver/streamts.cpp
index 6609ead9b..74379e4be 100644
--- a/src/driver/streamts.cpp
+++ b/src/driver/streamts.cpp
@@ -596,7 +596,7 @@ void CStreamManager::run()
 						printf("CStreamManager::run(): POLLHUP, fd %d\n", pfd[i].fd);
 						RemoveClient(pfd[i].fd);
 						if (streams.empty()) {
-							poll_timeout = -1;
+							poll_timeout = 2000;
 							g_RCInput->postMsg(NeutrinoMessages::EVT_STREAM_STOP, 0);
 						}
 					}