diff --git a/RewindClient.c b/RewindClient.c
index dd7c00d..fa54ba5 100644
--- a/RewindClient.c
+++ b/RewindClient.c
@@ -300,6 +300,9 @@ int WaitForRewindSessionEnd(struct RewindContext* context, struct RewindSessionP
   struct timeval threshold1;
   struct timeval threshold2;
 
+  if (interval1 < RECEIVE_TIMEOUT)
+    interval1 = RECEIVE_TIMEOUT;
+
   gettimeofday(&now, NULL);
 
   threshold1.tv_sec  = now.tv_sec + interval1 + interval2;