diff --git a/RewindClient.c b/RewindClient.c
index fa54ba5..868279b 100644
--- a/RewindClient.c
+++ b/RewindClient.c
@@ -348,17 +348,16 @@ int WaitForRewindSessionEnd(struct RewindContext* context, struct RewindSessionP
           threshold2.tv_sec  = 0;
           threshold2.tv_usec = 0;
         }
+        if ((threshold2.tv_sec != 0) &&
+            (timercmp(&now, &threshold2, >)))
+        {
+          // No active sessions during <interval2>
+          return CLIENT_ERROR_SUCCESS;
+        }
         state |= 0b10;
         break;
     }
 
-    if ((threshold2.tv_sec != 0) &&
-        (timercmp(&now, &threshold2, >)))
-    {
-      // No active sessions during <interval2>
-      return CLIENT_ERROR_SUCCESS;
-    }
-
     if (state == 0b11)
     {
       // Got REWIND_TYPE_KEEP_ALIVE and REWIND_TYPE_SESSION_POLL