diff --git a/app/src/main/java/org/schabi/newpipe/player/Player.java b/app/src/main/java/org/schabi/newpipe/player/Player.java
index 7ebf2e82e..35626be1b 100644
--- a/app/src/main/java/org/schabi/newpipe/player/Player.java
+++ b/app/src/main/java/org/schabi/newpipe/player/Player.java
@@ -72,6 +72,7 @@ import com.google.android.exoplayer2.PlaybackParameters;
 import com.google.android.exoplayer2.Player.PositionInfo;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.Tracks;
+import com.google.android.exoplayer2.audio.SilenceSkippingAudioProcessor;
 import com.google.android.exoplayer2.ext.mediasession.MediaSessionConnector;
 import com.google.android.exoplayer2.source.MediaSource;
 import com.google.android.exoplayer2.text.CueGroup;
@@ -293,10 +294,20 @@ public final class Player implements PlaybackListener, Listener {
                 new DefaultBandwidthMeter.Builder(context).build());
         loadController = new LoadController();
 
-        renderFactory = prefs.getBoolean(
-                context.getString(
-                        R.string.always_use_exoplayer_set_output_surface_workaround_key), false)
-                ? new CustomRenderersFactory(context) : new DefaultRenderersFactory(context);
+        final boolean alwaysUseExoplayerSetOutputSurfaceWorkaround = prefs.getBoolean(
+                context.getString(R.string.always_use_exoplayer_set_output_surface_workaround_key),
+                false);
+        final int maxSilenceDurationMillis = prefs.getInt(
+                context.getString(R.string.max_silence_duration_key),
+                Integer.parseInt(context.getString(R.string.max_silence_duration_value)));
+        final SilenceSkippingAudioProcessor silenceSkippingAudioProcessor =
+                new SilenceSkippingAudioProcessor(
+                        MILLISECONDS.toMicros(maxSilenceDurationMillis),
+                        MILLISECONDS.toMicros(maxSilenceDurationMillis),
+                        SilenceSkippingAudioProcessor.DEFAULT_SILENCE_THRESHOLD_LEVEL);
+        renderFactory = new CustomRenderersFactory(
+                context, alwaysUseExoplayerSetOutputSurfaceWorkaround,
+                silenceSkippingAudioProcessor);
 
         renderFactory.setEnableDecoderFallback(
                 prefs.getBoolean(
diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/CustomRenderersFactory.java b/app/src/main/java/org/schabi/newpipe/player/helper/CustomRenderersFactory.java
index 668b48c30..116cc3f11 100644
--- a/app/src/main/java/org/schabi/newpipe/player/helper/CustomRenderersFactory.java
+++ b/app/src/main/java/org/schabi/newpipe/player/helper/CustomRenderersFactory.java
@@ -5,6 +5,12 @@ import android.os.Handler;
 
 import com.google.android.exoplayer2.DefaultRenderersFactory;
 import com.google.android.exoplayer2.Renderer;
+import com.google.android.exoplayer2.audio.AudioCapabilities;
+import com.google.android.exoplayer2.audio.AudioProcessor;
+import com.google.android.exoplayer2.audio.AudioSink;
+import com.google.android.exoplayer2.audio.DefaultAudioSink;
+import com.google.android.exoplayer2.audio.SilenceSkippingAudioProcessor;
+import com.google.android.exoplayer2.audio.SonicAudioProcessor;
 import com.google.android.exoplayer2.mediacodec.MediaCodecSelector;
 import com.google.android.exoplayer2.video.VideoRendererEventListener;
 
@@ -22,8 +28,17 @@ import java.util.ArrayList;
  */
 public final class CustomRenderersFactory extends DefaultRenderersFactory {
 
-    public CustomRenderersFactory(final Context context) {
+    private final boolean alwaysUseExoplayerSetOutputSurfaceWorkaround;
+    private final SilenceSkippingAudioProcessor silenceSkippingAudioProcessor;
+
+    public CustomRenderersFactory(
+            final Context context,
+            final boolean alwaysUseExoplayerSetOutputSurfaceWorkaround,
+            final SilenceSkippingAudioProcessor silenceSkippingAudioProcessor) {
         super(context);
+        this.alwaysUseExoplayerSetOutputSurfaceWorkaround =
+                alwaysUseExoplayerSetOutputSurfaceWorkaround;
+        this.silenceSkippingAudioProcessor = silenceSkippingAudioProcessor;
     }
 
     @SuppressWarnings("checkstyle:ParameterNumber")
@@ -36,8 +51,35 @@ public final class CustomRenderersFactory extends DefaultRenderersFactory {
                                        final VideoRendererEventListener eventListener,
                                        final long allowedVideoJoiningTimeMs,
                                        final ArrayList<Renderer> out) {
-        out.add(new CustomMediaCodecVideoRenderer(context, getCodecAdapterFactory(),
-                mediaCodecSelector, allowedVideoJoiningTimeMs, enableDecoderFallback, eventHandler,
-                eventListener, MAX_DROPPED_VIDEO_FRAME_COUNT_TO_NOTIFY));
+        if (alwaysUseExoplayerSetOutputSurfaceWorkaround) {
+            out.add(new CustomMediaCodecVideoRenderer(context, getCodecAdapterFactory(),
+                    mediaCodecSelector, allowedVideoJoiningTimeMs, enableDecoderFallback,
+                    eventHandler, eventListener, MAX_DROPPED_VIDEO_FRAME_COUNT_TO_NOTIFY));
+        } else {
+            super.buildVideoRenderers(context, extensionRendererMode, mediaCodecSelector,
+                    enableDecoderFallback, eventHandler, eventListener, allowedVideoJoiningTimeMs,
+                    out);
+        }
+    }
+
+    @Override
+    protected AudioSink buildAudioSink(
+            final Context context,
+            final boolean enableFloatOutput,
+            final boolean enableAudioTrackPlaybackParams,
+            final boolean enableOffload) {
+        return new DefaultAudioSink.Builder()
+                .setAudioCapabilities(AudioCapabilities.getCapabilities(context))
+                .setEnableFloatOutput(enableFloatOutput)
+                .setEnableAudioTrackPlaybackParams(enableAudioTrackPlaybackParams)
+                .setOffloadMode(
+                        enableOffload
+                                ? DefaultAudioSink.OFFLOAD_MODE_ENABLED_GAPLESS_REQUIRED
+                                : DefaultAudioSink.OFFLOAD_MODE_DISABLED)
+                .setAudioProcessorChain(new DefaultAudioSink.DefaultAudioProcessorChain(
+                        new AudioProcessor[]{}, silenceSkippingAudioProcessor,
+                        new SonicAudioProcessor()
+                ))
+                .build();
     }
 }
diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml
index 352e4cec1..f4fd4ea5c 100644
--- a/app/src/main/res/values/settings_keys.xml
+++ b/app/src/main/res/values/settings_keys.xml
@@ -123,6 +123,10 @@
     <string name="default_popup_resolution_key">default_popup_resolution</string>
     <string name="default_popup_resolution_value">480p</string>
     <string name="best_resolution_key">best_resolution</string>
+    <string name="max_silence_duration_value">1000</string>
+    <string name="max_silence_duration_min">100</string>
+    <string name="max_silence_duration_max">5000</string>
+    <string name="max_silence_duration_key">max_silence_duration</string>
 
     <string-array name="high_resolution_list_values">
         <item>2160p</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index aeb4a5b6d..0816da7e7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -50,6 +50,7 @@
     <string name="default_popup_resolution_title">Default popup resolution</string>
     <string name="show_higher_resolutions_title">Show higher resolutions</string>
     <string name="show_higher_resolutions_summary">Only some devices can play 2K/4K videos</string>
+    <string name="max_silence_duration_title">Maximal silence duration in milliseconds that remains when &quot;fast forwarding during silence&quot; is enabled</string>
     <string name="play_with_kodi_title">Play with Kodi</string>
     <string name="kore_not_found">Install missing Kore app\?</string>
     <string name="show_play_with_kodi_title">Show \"Play with Kodi\" option</string>
diff --git a/app/src/main/res/xml/video_audio_settings.xml b/app/src/main/res/xml/video_audio_settings.xml
index 727ce4df4..701211a83 100644
--- a/app/src/main/res/xml/video_audio_settings.xml
+++ b/app/src/main/res/xml/video_audio_settings.xml
@@ -77,6 +77,17 @@
         app:singleLineTitle="false"
         app:iconSpaceReserved="false"/>
 
+    <SeekBarPreference
+        android:defaultValue="@string/max_silence_duration_value"
+        app:min="@string/max_silence_duration_min"
+        android:max="@string/max_silence_duration_max"
+        android:key="@string/max_silence_duration_key"
+        android:title="@string/max_silence_duration_title"
+        app:singleLineTitle="false"
+        app:iconSpaceReserved="false"
+        app:useSimpleSummaryProvider="true"
+        app:showSeekBarValue="true" />
+
     <PreferenceScreen
         android:fragment="org.schabi.newpipe.settings.ExoPlayerSettingsFragment"
         android:key="@string/exoplayer_settings_key"