diff --git a/app/src/main/java/app/tivi/util/AndroidPowerController.kt b/app/src/main/java/app/tivi/util/AndroidPowerController.kt
index 58b078426d..2cc01ff17c 100644
--- a/app/src/main/java/app/tivi/util/AndroidPowerController.kt
+++ b/app/src/main/java/app/tivi/util/AndroidPowerController.kt
@@ -19,9 +19,10 @@ package app.tivi.util
 import android.content.Context
 import android.content.IntentFilter
 import android.net.ConnectivityManager
+import android.os.Build
 import android.os.PowerManager
+import androidx.annotation.RequiresApi
 import androidx.core.content.getSystemService
-import androidx.core.net.ConnectivityManagerCompat
 import app.tivi.settings.TiviPreferences
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -49,17 +50,22 @@ internal class AndroidPowerController @Inject constructor(
         }
     }
 
-    override fun shouldSaveData(): SaveData {
-        if (preferences.useLessData) {
-            return SaveData.Enabled(SaveDataReason.PREFERENCE)
+    override fun shouldSaveData(): SaveData = when {
+        preferences.useLessData -> {
+            SaveData.Enabled(SaveDataReason.PREFERENCE)
         }
-        if (powerManager.isPowerSaveMode) {
-            return SaveData.Enabled(SaveDataReason.SYSTEM_POWER_SAVER)
+        powerManager.isPowerSaveMode -> {
+            SaveData.Enabled(SaveDataReason.SYSTEM_POWER_SAVER)
         }
-        if (ConnectivityManagerCompat.getRestrictBackgroundStatus(connectivityManager)
-            == ConnectivityManagerCompat.RESTRICT_BACKGROUND_STATUS_ENABLED) {
-            return SaveData.Enabled(SaveDataReason.SYSTEM_DATA_SAVER)
+        Build.VERSION.SDK_INT >= 24 && isBackgroundDataRestricted() -> {
+            SaveData.Enabled(SaveDataReason.SYSTEM_DATA_SAVER)
         }
-        return SaveData.Disabled
+        else -> SaveData.Disabled
+    }
+
+    @RequiresApi(24)
+    private fun isBackgroundDataRestricted(): Boolean {
+        return connectivityManager.restrictBackgroundStatus ==
+            ConnectivityManager.RESTRICT_BACKGROUND_STATUS_ENABLED
     }
 }