diff --git a/app/src/main/java/com/github/libretube/compat/ServiceCompat.kt b/app/src/main/java/com/github/libretube/compat/ServiceCompat.kt
deleted file mode 100644
index 78eca6933..000000000
--- a/app/src/main/java/com/github/libretube/compat/ServiceCompat.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.github.libretube.compat
-
-import android.content.Context
-import android.content.Intent
-import android.os.Build
-
-class ServiceCompat(private val context: Context) {
-    fun startForeground(intent: Intent) {
-        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.O) {
-            context.startForegroundService(intent)
-        } else {
-            context.startService(intent)
-        }
-    }
-}
diff --git a/app/src/main/java/com/github/libretube/receivers/NotificationReceiver.kt b/app/src/main/java/com/github/libretube/receivers/NotificationReceiver.kt
index eabda593a..d3c8cd586 100644
--- a/app/src/main/java/com/github/libretube/receivers/NotificationReceiver.kt
+++ b/app/src/main/java/com/github/libretube/receivers/NotificationReceiver.kt
@@ -3,23 +3,21 @@ package com.github.libretube.receivers
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import com.github.libretube.compat.ServiceCompat
+import androidx.core.content.ContextCompat
 import com.github.libretube.services.DownloadService
 
 class NotificationReceiver : BroadcastReceiver() {
-    override fun onReceive(context: Context?, intent: Intent?) {
-        if (intent?.action == null) return
+    override fun onReceive(context: Context, intent: Intent) {
+        if (intent.action == null) return
 
         val serviceIntent = Intent(context, DownloadService::class.java)
-        serviceIntent.action = intent.action
+            .setAction(intent.action)
 
         val id = intent.getIntExtra("id", -1)
         if (id == -1) return
         serviceIntent.putExtra("id", id)
 
-        context?.let {
-            ServiceCompat(it).startForeground(serviceIntent)
-        }
+        ContextCompat.startForegroundService(context, serviceIntent)
     }
 
     companion object {
diff --git a/app/src/main/java/com/github/libretube/util/BackgroundHelper.kt b/app/src/main/java/com/github/libretube/util/BackgroundHelper.kt
index 8c74b7e72..77ae845e8 100644
--- a/app/src/main/java/com/github/libretube/util/BackgroundHelper.kt
+++ b/app/src/main/java/com/github/libretube/util/BackgroundHelper.kt
@@ -3,7 +3,7 @@ package com.github.libretube.util
 import android.app.ActivityManager
 import android.content.Context
 import android.content.Intent
-import com.github.libretube.compat.ServiceCompat
+import androidx.core.content.ContextCompat
 import com.github.libretube.constants.IntentData
 import com.github.libretube.services.BackgroundMode
 
@@ -33,7 +33,7 @@ object BackgroundHelper {
         intent.putExtra(IntentData.keepQueue, keepQueue)
 
         // start the background mode as foreground service
-        ServiceCompat(context).startForeground(intent)
+        ContextCompat.startForegroundService(context, intent)
     }
 
     /**
diff --git a/app/src/main/java/com/github/libretube/util/DownloadHelper.kt b/app/src/main/java/com/github/libretube/util/DownloadHelper.kt
index b91810cad..a9f513519 100644
--- a/app/src/main/java/com/github/libretube/util/DownloadHelper.kt
+++ b/app/src/main/java/com/github/libretube/util/DownloadHelper.kt
@@ -3,7 +3,7 @@ package com.github.libretube.util
 import android.content.Context
 import android.content.Intent
 import android.os.Build
-import com.github.libretube.compat.ServiceCompat
+import androidx.core.content.ContextCompat
 import com.github.libretube.constants.IntentData
 import com.github.libretube.constants.PreferenceKeys
 import com.github.libretube.db.obj.DownloadItem
@@ -66,7 +66,7 @@ object DownloadHelper {
         intent.putExtra(IntentData.audioQuality, audioQuality)
         intent.putExtra(IntentData.subtitleCode, subtitleCode)
 
-        ServiceCompat(context).startForeground(intent)
+        ContextCompat.startForegroundService(context, intent)
     }
 
     fun DownloadItem.getNotificationId(): Int {