diff --git a/src/core/ipv4/igmp.c b/src/core/ipv4/igmp.c
index db531af3..4e8d25e2 100644
--- a/src/core/ipv4/igmp.c
+++ b/src/core/ipv4/igmp.c
@@ -719,23 +719,16 @@ igmp_timeout(struct igmp_group *group)
 static void
 igmp_start_timer(struct igmp_group *group, u8_t max_time)
 {
-  /* ensure the input value is > 0 */
 #ifdef LWIP_RAND
-  if (max_time == 0) {
-    max_time = 1;
-  }
-  /* ensure the random value is > 0 */
-  group->timer = (LWIP_RAND() % max_time);
-  if (group->timer == 0) {
-    group->timer = 1;
-  }
+  group->timer = max_time > 2 ? (LWIP_RAND() % max_time) : 1;
 #else /* LWIP_RAND */
   /* ATTENTION: use this only if absolutely necessary! */
   group->timer = max_time / 2;
+#endif /* LWIP_RAND */
+
   if (group->timer == 0) {
     group->timer = 1;
   }
-#endif /* LWIP_RAND */
 }
 
 /**