diff --git a/Core/Shared/Audio/AudioPlayerHud.cpp b/Core/Shared/Audio/AudioPlayerHud.cpp
index 9a7174fef7..0959daa0b0 100644
--- a/Core/Shared/Audio/AudioPlayerHud.cpp
+++ b/Core/Shared/Audio/AudioPlayerHud.cpp
@@ -161,6 +161,8 @@ void AudioPlayerHud::Draw(uint32_t frameCounter, double fps)
 				double silenceLength = (double)(frameCounter - _lastAudioFrame) / fps;
 				if(audioCfg.AudioPlayerAutoDetectSilence && silenceLength >= audioCfg.AudioPlayerSilenceDelay) {
 					//Silence detected, move to next track
+					_lastAudioFrame = frameCounter;
+					_prevFps = fps;
 					MoveToNextTrack();
 				}
 			}
diff --git a/UI/Views/AudioConfigView.axaml b/UI/Views/AudioConfigView.axaml
index 11ec5667a0..b74a8bc55d 100644
--- a/UI/Views/AudioConfigView.axaml
+++ b/UI/Views/AudioConfigView.axaml
@@ -120,12 +120,12 @@
 						<StackPanel Margin="10 5 0 0">
 							<StackPanel Orientation="Horizontal">
 								<CheckBox IsChecked="{Binding Config.AudioPlayerAutoDetectSilence}" Content="{l:Translate chkAudioPlayerAutoDetectSilence}" />
-								<c:MesenNumericUpDown Margin="5 1" Maximum="999999" Value="{Binding Config.AudioPlayerSilenceDelay}" IsEnabled="{Binding Config.AudioPlayerAutoDetectSilence}" />
+								<c:MesenNumericUpDown Margin="5 1" Minimum="1" Maximum="999999" Value="{Binding Config.AudioPlayerSilenceDelay}" IsEnabled="{Binding Config.AudioPlayerAutoDetectSilence}" />
 								<TextBlock Text="{l:Translate lblMillisecondsOfSilence}" />
 							</StackPanel>
 							<StackPanel Orientation="Horizontal">
 								<CheckBox IsChecked="{Binding Config.AudioPlayerEnableTrackLength}" Content="{l:Translate chkAudioPlayerEnableTrackLength}" />
-								<c:MesenNumericUpDown Margin="5 1" Maximum="9999" Value="{Binding Config.AudioPlayerTrackLength}" IsEnabled="{Binding Config.AudioPlayerEnableTrackLength}" />
+								<c:MesenNumericUpDown Margin="5 1" Minimum="1" Maximum="9999" Value="{Binding Config.AudioPlayerTrackLength}" IsEnabled="{Binding Config.AudioPlayerEnableTrackLength}" />
 								<TextBlock Text="{l:Translate lblSeconds}" />
 							</StackPanel>
 						</StackPanel>