diff --git a/pkgs/racket-test-core/tests/racket/logger.rktl b/pkgs/racket-test-core/tests/racket/logger.rktl
index 97c2f0a63d..fa989fc4fe 100644
--- a/pkgs/racket-test-core/tests/racket/logger.rktl
+++ b/pkgs/racket-test-core/tests/racket/logger.rktl
@@ -348,6 +348,25 @@
   ;; Retain receiver
   (test #f sync/timeout 0 r2))
 
+
+; --------------------
+;; Regression test for `log-message` mis-parsing arguments,
+;; based on Cameron Moy's example
+
+(let ()
+  (define-logger hello)
+  (define (f)
+    (log-hello-info "foo")
+    (define result (findf (λ (x) #f) null)) ; provokes a false in the right place...
+    (log-hello-info "bar")
+    result)
+  (set! f f)
+
+  (define recv (make-log-receiver hello-logger 'info))
+  (f)
+  (test "hello: foo" vector-ref (sync recv) 1)
+  (test "hello: bar" vector-ref (sync recv) 1))
+
 ; --------------------
 
 (report-errs)
diff --git a/racket/src/racket/src/error.c b/racket/src/racket/src/error.c
index a22db594ee..401abed46f 100644
--- a/racket/src/racket/src/error.c
+++ b/racket/src/racket/src/error.c
@@ -4085,7 +4085,7 @@ log_message(int argc, Scheme_Object *argv[])
   bytes = scheme_char_string_to_byte_string(bytes);
   pos++;
 
-  if (argc >= (pos+1))
+  if (argc > (pos+1))
     pfx = SCHEME_TRUEP(argv[pos+1]);
   else
     pfx = 1;