diff --git a/circ/circulation.pl b/circ/circulation.pl
index 42bd3db073..d1fe834df3 100755
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -132,6 +132,8 @@ if ( C4::Context->preference("AutoSwitchPatron") && $barcode ) {
         $findborrower = $barcode;
         undef $barcode;
         undef $borrowernumber;
+        undef $patron;
+        $barcodes = [];
         $autoswitched = 1;
     }
 }