diff --git a/rpcs3/Emu/Audio/AudioBackend.h b/rpcs3/Emu/Audio/AudioBackend.h
index ef334f9569..cb665dd9d0 100644
--- a/rpcs3/Emu/Audio/AudioBackend.h
+++ b/rpcs3/Emu/Audio/AudioBackend.h
@@ -15,10 +15,10 @@ class AudioBackend
 public:
 	enum Capabilities : u32
 	{
-		PLAY_PAUSE_FLUSH = 0x1, // AddData implements Play, Pause, Flush
-		IS_PLAYING = 0x2, // Implements IsPlaying method
-		GET_NUM_ENQUEUED_SAMPLES = 0x4, // Supports GetNumEnqueuedSamples method
-		SET_FREQUENCY_RATIO = 0x8, // Implements SetFrequencyRatio method
+		PLAY_PAUSE_FLUSH = 0x1, // Implements Play, Pause, Flush
+		IS_PLAYING = 0x2, // Implements IsPlaying
+		GET_NUM_ENQUEUED_SAMPLES = 0x4, // Implements GetNumEnqueuedSamples
+		SET_FREQUENCY_RATIO = 0x8, // Implements SetFrequencyRatio
 	};
 
 	virtual ~AudioBackend() = default;
diff --git a/rpcs3/Emu/Cell/Modules/cellAudio.h b/rpcs3/Emu/Cell/Modules/cellAudio.h
index 064b29696e..4dc198b535 100644
--- a/rpcs3/Emu/Cell/Modules/cellAudio.h
+++ b/rpcs3/Emu/Cell/Modules/cellAudio.h
@@ -182,9 +182,9 @@ struct cell_audio_config
 	/*
 	 * Buffering
 	 */
-	const u64 desired_buffer_duration = g_cfg.audio.enable_buffering ? g_cfg.audio.desired_buffer_duration : 0;
+	const u64 desired_buffer_duration = g_cfg.audio.desired_buffer_duration * 1000llu;
 private:
-	const bool raw_buffering_enabled = g_cfg.audio.enable_buffering && (desired_buffer_duration >= audio_block_period);
+	const bool raw_buffering_enabled = static_cast<bool>(g_cfg.audio.enable_buffering);
 public:
 	// We need a non-blocking backend (implementing play/pause/flush) to be able to do buffering correctly
 	// We also need to be able to query the current playing state
diff --git a/rpcs3/Emu/System.h b/rpcs3/Emu/System.h
index 2c80706808..057ebb4962 100644
--- a/rpcs3/Emu/System.h
+++ b/rpcs3/Emu/System.h
@@ -529,7 +529,7 @@ struct cfg_root : cfg::node
 		cfg::_int<1, 128> startt{this, "Start Threshold", 1}; // TODO: used only by ALSA, should probably be removed once ALSA is upgraded
 		cfg::_int<0, 200> volume{this, "Master Volume", 100};
 		cfg::_bool enable_buffering{this, "Enable Buffering", true};
-		cfg::_int <0, 250'000> desired_buffer_duration{this, "Desired Audio Buffer Duration", 100'000};
+		cfg::_int <20, 250> desired_buffer_duration{this, "Desired Audio Buffer Duration", 100};
 		cfg::_int<1, 1000> sampling_period_multiplier{this, "Sampling Period Multiplier", 100};
 		cfg::_bool enable_time_stretching{this, "Enable Time Stretching", false};
 		cfg::_int<0, 100> time_stretching_threshold{this, "Time Stretching Threshold", 75};