diff --git a/app/build.gradle b/app/build.gradle
index 34b52a69390..20fe928074c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,8 +17,8 @@ android {
         resValue "string", "app_name", "NewPipe"
         minSdkVersion 19
         targetSdkVersion 29
-        versionCode 970
-        versionName "0.21.4"
+        versionCode 971
+        versionName "0.21.5"
 
         multiDexEnabled true
 
diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/LoadController.java b/app/src/main/java/org/schabi/newpipe/player/helper/LoadController.java
index b04812a12a9..e4ae2775090 100644
--- a/app/src/main/java/org/schabi/newpipe/player/helper/LoadController.java
+++ b/app/src/main/java/org/schabi/newpipe/player/helper/LoadController.java
@@ -32,7 +32,8 @@ private LoadController(final int initialPlaybackBufferMs,
 
         final DefaultLoadControl.Builder builder = new DefaultLoadControl.Builder();
         builder.setBufferDurationsMs(minimumPlaybackBufferMs, optimalPlaybackBufferMs,
-                initialPlaybackBufferMs, initialPlaybackBufferMs);
+                initialPlaybackBufferMs,
+                DefaultLoadControl.DEFAULT_BUFFER_FOR_PLAYBACK_AFTER_REBUFFER_MS);
         internalLoadControl = builder.build();
     }
 
diff --git a/app/src/main/res/layout-large-land/player.xml b/app/src/main/res/layout-large-land/player.xml
index 32fa2b3d560..ddb4289fe4c 100644
--- a/app/src/main/res/layout-large-land/player.xml
+++ b/app/src/main/res/layout-large-land/player.xml
@@ -578,6 +578,17 @@
                 android:tint="?attr/colorAccent"
                 app:srcCompat="@drawable/ic_shuffle"
                 tools:ignore="ContentDescription,RtlHardcoded" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/itemsListHeaderDuration"
+                style="@style/TextAppearance.AppCompat.Medium"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_toLeftOf="@id/itemsListClose"
+                android:layout_toRightOf="@id/shuffleButton"
+                android:gravity="center"
+                android:textColor="@android:color/white" />
         </RelativeLayout>
 
         <androidx.recyclerview.widget.RecyclerView
diff --git a/fastlane/metadata/android/en-US/changelogs/971.txt b/fastlane/metadata/android/en-US/changelogs/971.txt
new file mode 100644
index 00000000000..8e1a71457b8
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/971.txt
@@ -0,0 +1,3 @@
+Hotfix
+• Increase buffer for playback after rebuffer
+• Fixed crash on tablets and TVs when clicking on the play-queue icon in the player