diff --git a/app/src/main/java/com/github/libretube/helpers/DisplayHelper.kt b/app/src/main/java/com/github/libretube/helpers/DisplayHelper.kt
index 40555e1ca..6006db7e2 100644
--- a/app/src/main/java/com/github/libretube/helpers/DisplayHelper.kt
+++ b/app/src/main/java/com/github/libretube/helpers/DisplayHelper.kt
@@ -11,12 +11,8 @@ object DisplayHelper {
      * Returns false on and below SDK 24
      */
     fun supportsHdr(context: Context): Boolean {
-        val displayManager = context.getSystemService(Context.DISPLAY_SERVICE) as DisplayManager
-        val display = displayManager.getDisplay(Display.DEFAULT_DISPLAY)
-        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            display.hdrCapabilities.supportedHdrTypes.isNotEmpty()
-        } else {
-            false
-        }
+        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.N &&
+            context.getSystemService(DisplayManager::class.java).getDisplay(Display.DEFAULT_DISPLAY)
+                .hdrCapabilities.supportedHdrTypes.isNotEmpty()
     }
 }
diff --git a/app/src/main/java/com/github/libretube/helpers/PlayerHelper.kt b/app/src/main/java/com/github/libretube/helpers/PlayerHelper.kt
index 491e6a06c..1b4a260e5 100644
--- a/app/src/main/java/com/github/libretube/helpers/PlayerHelper.kt
+++ b/app/src/main/java/com/github/libretube/helpers/PlayerHelper.kt
@@ -59,11 +59,8 @@ object PlayerHelper {
      * Create a base64 encoded DASH stream manifest
      */
     fun createDashSource(streams: Streams, context: Context, audioOnly: Boolean = false): Uri {
-        val manifest = DashHelper.createManifest(
-            streams,
-            DisplayHelper.supportsHdr(context),
-            audioOnly
-        )
+        val supportsHdr = DisplayHelper.supportsHdr(context)
+        val manifest = DashHelper.createManifest(streams, supportsHdr, audioOnly)
 
         // encode to base64
         val encoded = Base64.encodeToString(manifest.toByteArray(), Base64.DEFAULT)