diff --git a/RewindClient.c b/RewindClient.c
index 6b25e8c..5592294 100644
--- a/RewindClient.c
+++ b/RewindClient.c
@@ -300,7 +300,7 @@ int WaitForRewindSessionEnd(struct RewindContext* context, struct RewindSessionP
   struct timeval threshold;
 
   gettimeofday(&now, NULL);
-  threshold.tv_sec  = now.tv_sec + CONNECT_TIMEOUT;
+  threshold.tv_sec  = now.tv_sec + interval;
   threshold.tv_usec = now.tv_usec; 
 
   while (timercmp(&now, &threshold, <))