diff --git a/src/s_sound.c b/src/s_sound.c
index af1425abf..3b0c87463 100644
--- a/src/s_sound.c
+++ b/src/s_sound.c
@@ -1429,7 +1429,7 @@ UINT32 S_GetMusicLength(void)
 
 boolean S_SetMusicLoopPoint(UINT32 looppoint)
 {
-	return I_SetMusicPosition(looppoint);
+	return I_SetMusicLoopPoint(looppoint);
 }
 
 UINT32 S_GetMusicLoopPoint(void)
diff --git a/src/sdl/mixer_sound.c b/src/sdl/mixer_sound.c
index 3cdc061dc..3da012c85 100644
--- a/src/sdl/mixer_sound.c
+++ b/src/sdl/mixer_sound.c
@@ -942,7 +942,7 @@ UINT32 I_GetMusicLength(void)
 
 boolean I_SetMusicLoopPoint(UINT32 looppoint)
 {
-	if (midimode || gme || !music || I_MusicType() == MU_MOD)
+	if (midimode || gme || !music || I_MusicType() == MU_MOD || !is_looping)
 		return false;
 	else
 	{