diff --git a/src/libs/decoders/SDL_sound.c b/src/libs/decoders/SDL_sound.c
index f71650cf..18a0e70d 100644
--- a/src/libs/decoders/SDL_sound.c
+++ b/src/libs/decoders/SDL_sound.c
@@ -145,7 +145,10 @@ int Sound_Quit(void)
     BAIL_IF_MACRO(!initialized, ERR_NOT_INITIALIZED, 0);
 
     while (((volatile Sound_Sample *) sample_list) != NULL)
-        Sound_FreeSample(sample_list);
+    {
+        Sound_Sample *sample = sample_list;
+        Sound_FreeSample(sample); /* Updates sample_list. */
+    }
 
     initialized = 0;