diff --git a/racket/collects/racket/list.rkt b/racket/collects/racket/list.rkt
index 92a38a8e6a..3993c77937 100644
--- a/racket/collects/racket/list.rkt
+++ b/racket/collects/racket/list.rkt
@@ -601,6 +601,7 @@
 
 ;; Fisher-Yates Shuffle
 (define (shuffle l)
+  (unless (list? l) (raise-argument-error 'shuffle "list?" 0 l))
   (define a (make-vector (length l)))
   (for ([x (in-list l)] [i (in-naturals)])
     (define j (random (add1 i)))