diff --git a/src/core/settings.h b/src/core/settings.h
index 875bc0a5d..0f6b2aed4 100644
--- a/src/core/settings.h
+++ b/src/core/settings.h
@@ -414,11 +414,6 @@ struct Settings : public GPUSettings
 
   ALWAYS_INLINE bool IsRunaheadEnabled() const { return (runahead_frames > 0); }
 
-  ALWAYS_INLINE u8 GetAudioOutputVolume(bool fast_forwarding) const
-  {
-    return audio_output_muted ? 0 : (fast_forwarding ? audio_fast_forward_volume : audio_output_volume);
-  }
-
   /// Returns the default type for the specified port.
   ALWAYS_INLINE static ControllerType GetDefaultControllerType(u32 pad)
   {
diff --git a/src/core/system.cpp b/src/core/system.cpp
index 03e51bae2..d1c542ad3 100644
--- a/src/core/system.cpp
+++ b/src/core/system.cpp
@@ -5329,7 +5329,9 @@ bool System::IsFastForwardingBoot()
 
 u8 System::GetAudioOutputVolume()
 {
-  return g_settings.GetAudioOutputVolume(IsRunningAtNonStandardSpeed());
+  return ((s_state.target_speed == 0.0 || s_state.target_speed > 1.0f) && !s_state.syncing_to_host) ?
+           g_settings.audio_fast_forward_volume :
+           g_settings.audio_output_volume;
 }
 
 void System::UpdateVolume()