diff --git a/src/external/jar_xm.h b/src/external/jar_xm.h
index de6ad4107..812611980 100644
--- a/src/external/jar_xm.h
+++ b/src/external/jar_xm.h
@@ -2670,7 +2670,7 @@ void jar_xm_reset(jar_xm_context_t* ctx)
         jar_xm_cut_note(&ctx->channels[i]);
     }
     ctx->current_row = 0;
-    ctx->current_table_index = ctx->module.restart_position;
+    ctx->current_table_index = 0;
     ctx->current_tick = 0;
 }
 
diff --git a/src/raudio.c b/src/raudio.c
index f6a1e5f65..a2093d844 100644
--- a/src/raudio.c
+++ b/src/raudio.c
@@ -1246,6 +1246,7 @@ Music LoadMusicStream(const char *fileName)
             music.stream = InitAudioStream(48000, 16, 2);
             music.sampleCount = (unsigned int)jar_xm_get_remaining_samples(ctxXm);
             music.loopCount = 0;   // Infinite loop by default
+            jar_xm_reset(ctxXm);   // make sure we start at the beginning of the song
             musicLoaded = true;
 
             music.ctxData = ctxXm;