diff --git a/src/basic/ratelimit.c b/src/basic/ratelimit.c
index c16c8f7103..f90a63b1a9 100644
--- a/src/basic/ratelimit.c
+++ b/src/basic/ratelimit.c
@@ -10,6 +10,7 @@
 
 bool ratelimit_below(RateLimit *r) {
         usec_t ts;
+        bool good = false;
 
         assert(r);
 
@@ -24,18 +25,12 @@ bool ratelimit_below(RateLimit *r) {
 
                 /* Reset counter */
                 r->num = 0;
-                goto good;
-        }
-
-        if (r->num < r->burst)
-                goto good;
+                good = true;
+        } else if (r->num < r->burst)
+                good = true;
 
         r->num++;
-        return false;
-
-good:
-        r->num++;
-        return true;
+        return good;
 }
 
 unsigned ratelimit_num_dropped(RateLimit *r) {