diff --git a/src/subscriptions.c b/src/subscriptions.c
index e6e64577..67d0bf9f 100644
--- a/src/subscriptions.c
+++ b/src/subscriptions.c
@@ -329,7 +329,7 @@ subscription_reschedule(void)
     subscription_unsubscribe(s);
   }
 
-  if (postpone <= 0)
+  if (postpone <= 0 || postpone == INT_MAX)
     postpone = 2;
   gtimer_arm(&subscription_reschedule_timer,
 	           subscription_reschedule_cb, NULL, postpone);