diff --git a/src/FAudio_platform_win32.c b/src/FAudio_platform_win32.c
index 591ec4d18..15a9751d7 100644
--- a/src/FAudio_platform_win32.c
+++ b/src/FAudio_platform_win32.c
@@ -1069,7 +1069,7 @@ FAUDIOAPI uint32_t XNA_GetSongEnded()
 		return 1;
 	}
 	FAudioSourceVoice_GetState(songVoice, &state, 0);
-	return state.BuffersQueued == 0;
+	return state.BuffersQueued == 0 && state.SamplesPlayed == 0;
 }
 
 FAUDIOAPI void XNA_EnableVisualization(uint32_t enable)
diff --git a/src/XNA_Song.c b/src/XNA_Song.c
index 982ff904a..a8755833c 100644
--- a/src/XNA_Song.c
+++ b/src/XNA_Song.c
@@ -325,7 +325,7 @@ FAUDIOAPI uint32_t XNA_GetSongEnded()
 		return 1;
 	}
 	FAudioSourceVoice_GetState(songVoice, &state, 0);
-	return state.BuffersQueued == 0;
+	return state.BuffersQueued == 0 && state.SamplesPlayed == 0;
 }
 
 FAUDIOAPI void XNA_EnableVisualization(uint32_t enable)