diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHolder.kt b/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHolder.kt
index 22fff7d5d..6e4c80cd5 100644
--- a/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHolder.kt
+++ b/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHolder.kt
@@ -71,15 +71,13 @@ class PlayerHolder private constructor() {
     fun setListener(newListener: PlayerServiceExtendedEventListener?) {
         listener = newListener
 
-        if (listener == null) {
-            return
-        }
-
         // Force reload data from service
-        if (playerService != null) {
-            listener!!.onServiceConnected(playerService!!)
-            startPlayerListener()
-            // ^ will call listener.onPlayerConnected() down the line if there is an active player
+        newListener?.let { listener ->
+            playerService?.let {
+                listener.onServiceConnected(it)
+                startPlayerListener()
+                // ^ will call listener.onPlayerConnected() down the line if there is an active player
+            }
         }
     }