diff --git a/libsrc/c64/joy/c64-stdjoy.s b/libsrc/c64/joy/c64-stdjoy.s
index c983d81bb..d11093fba 100644
--- a/libsrc/c64/joy/c64-stdjoy.s
+++ b/libsrc/c64/joy/c64-stdjoy.s
@@ -93,9 +93,7 @@ joy1:   lda     #$7F
         sta     CIA1_PRA
         lda     CIA1_PRB
         cli
-        and     #$1F
-        eor     #$1F
-        rts
+        jmp     end
 
 ; Read joystick 2
 
@@ -107,8 +105,6 @@ joy2:   ldx     #0
         lda     CIA1_PRA
         sty     CIA1_DDRA
         cli
-        and     #$1F
+end:    and     #$1F
         eor     #$1F
         rts
-
-