diff --git a/app/src/main/java/com/github/libretube/extensions/Player.kt b/app/src/main/java/com/github/libretube/extensions/Player.kt
index 60a1ea17e4..ec43965be6 100644
--- a/app/src/main/java/com/github/libretube/extensions/Player.kt
+++ b/app/src/main/java/com/github/libretube/extensions/Player.kt
@@ -13,7 +13,7 @@ fun Player.togglePlayPauseState() {
             seekTo(0)
         }
 
-        !isPlaying && !isLoading -> play()
+        !isPlaying && totalBufferedDuration > 0 -> play()
         else -> pause()
     }
 }