diff --git a/SoundEngine/famistudio_asm6.asm b/SoundEngine/famistudio_asm6.asm
index 798d9d801..e768768e7 100644
--- a/SoundEngine/famistudio_asm6.asm
+++ b/SoundEngine/famistudio_asm6.asm
@@ -6640,14 +6640,14 @@ famistudio_sfx_update:
     .if FAMISTUDIO_CFG_SFX_STREAMS > 3
         ldx #FAMISTUDIO_SFX_CH2
         jsr famistudio_sfx_clear_channel
+        ldx tmp
     .endif
 .endif
 
 @sfx_active:
 .if FAMISTUDIO_CFG_SFX_MIXED = 0
     .if FAMISTUDIO_CFG_SFX_STREAMS > 1
-        ldx tmp                       ;load effect pointer into temp
-        lda famistudio_sfx_ptr_hi,x
+        lda famistudio_sfx_ptr_hi,x ; Load effect pointer into temp
     .endif
 .endif
     sta effect_data_ptr+1
diff --git a/SoundEngine/famistudio_ca65.s b/SoundEngine/famistudio_ca65.s
index d24efd74e..d29611c2c 100644
--- a/SoundEngine/famistudio_ca65.s
+++ b/SoundEngine/famistudio_ca65.s
@@ -6686,14 +6686,14 @@ famistudio_sfx_update:
     .if FAMISTUDIO_CFG_SFX_STREAMS > 3
         ldx #FAMISTUDIO_SFX_CH2
         jsr famistudio_sfx_clear_channel
+        ldx @tmp
     .endif
 .endif
 
 @sfx_active:
 .if FAMISTUDIO_CFG_SFX_MIXED = 0
     .if FAMISTUDIO_CFG_SFX_STREAMS > 1
-        ldx @tmp                       ;load effect pointer into temp
-        lda famistudio_sfx_ptr_hi,x
+        lda famistudio_sfx_ptr_hi,x ; Load effect pointer into temp
     .endif
 .endif
     sta @effect_data_ptr+1
diff --git a/SoundEngine/famistudio_nesasm.asm b/SoundEngine/famistudio_nesasm.asm
index 530dc9791..7372d76f4 100644
--- a/SoundEngine/famistudio_nesasm.asm
+++ b/SoundEngine/famistudio_nesasm.asm
@@ -6699,14 +6699,14 @@ famistudio_sfx_update:
     .if FAMISTUDIO_CFG_SFX_STREAMS > 3
         ldx #FAMISTUDIO_SFX_CH2
         jsr famistudio_sfx_clear_channel
+        ldx tmp
     .endif
 .endif
 
 .sfx_active:
     .if FAMISTUDIO_CFG_SFX_MIXED = 0
         .if FAMISTUDIO_CFG_SFX_STREAMS > 1
-            ldx tmp                       ;load effect pointer into temp
-            lda famistudio_sfx_ptr_hi,x
+            lda famistudio_sfx_ptr_hi,x ; Load effect pointer into temp
         .endif
     .endif
     sta <.effect_data_ptr+1