diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9cce60469..dfe8cd77b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -10,6 +10,7 @@
     <uses-permission android:name="android.permission.WAKE_LOCK"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+    <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
 
     <supports-screens
         android:anyDensity="true"
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/NetworkPreferencesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/NetworkPreferencesFragment.java
index 50de1e3c4..c1cb8adb1 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/NetworkPreferencesFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/NetworkPreferencesFragment.java
@@ -1,9 +1,14 @@
 package de.danoeh.antennapod.fragment.preferences;
 
 import android.content.Context;
+import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.Resources;
+import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
+import android.os.PowerManager;
+import android.provider.Settings;
 import android.text.format.DateFormat;
 import androidx.preference.PreferenceFragmentCompat;
 import androidx.preference.PreferenceManager;
@@ -17,10 +22,13 @@ import java.util.Calendar;
 import java.util.GregorianCalendar;
 import java.util.concurrent.TimeUnit;
 
+import static android.content.Context.POWER_SERVICE;
+
 
 public class NetworkPreferencesFragment extends PreferenceFragmentCompat
         implements SharedPreferences.OnSharedPreferenceChangeListener {
     private static final String PREF_SCREEN_AUTODL = "prefAutoDownloadSettings";
+    private static final String PREF_BATTERY_OPTIMIZATION = "prefBatteryOptimization";
     private static final String PREF_PROXY = "prefProxy";
 
     @Override
@@ -59,6 +67,20 @@ public class NetworkPreferencesFragment extends PreferenceFragmentCompat
                     new FeedRefreshIntervalDialog(getContext()).show();
                     return true;
                 });
+        if (Build.VERSION.SDK_INT >= 31) {
+            PowerManager powerManager = (PowerManager) getContext().getSystemService(POWER_SERVICE);
+            if (!powerManager.isIgnoringBatteryOptimizations(getContext().getPackageName())) {
+                findPreference(PREF_BATTERY_OPTIMIZATION).setVisible(true);
+                findPreference(PREF_BATTERY_OPTIMIZATION).setOnPreferenceClickListener(preference -> {
+                    findPreference(PREF_BATTERY_OPTIMIZATION).setVisible(false);
+                    Intent i = new Intent();
+                    i.setAction(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
+                    i.setData(Uri.parse("package:" + getContext().getPackageName()));
+                    startActivity(i);
+                    return true;
+                });
+            }
+        }
 
         findPreference(UserPreferences.PREF_PARALLEL_DOWNLOADS)
                 .setOnPreferenceChangeListener(
diff --git a/app/src/main/res/xml/preferences_network.xml b/app/src/main/res/xml/preferences_network.xml
index 428c891ad..34832378f 100644
--- a/app/src/main/res/xml/preferences_network.xml
+++ b/app/src/main/res/xml/preferences_network.xml
@@ -2,8 +2,14 @@
 <PreferenceScreen
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:numberpicker="http://schemas.android.com/apk/de.danoeh.antennapod"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
         xmlns:search="http://schemas.android.com/apk/com.bytehamster.lib.preferencesearch">
     <PreferenceCategory android:title="@string/automation">
+        <Preference
+                android:key="prefBatteryOptimization"
+                android:title="@string/battery_optimization_pref_title"
+                android:summary="@string/battery_optimization_pref"
+                app:isPreferenceVisible="false" />
         <Preference
                 android:key="prefAutoUpdateIntervall"
                 android:summary="@string/feed_refresh_sum"
diff --git a/ui/i18n/src/main/res/values/strings.xml b/ui/i18n/src/main/res/values/strings.xml
index 71582087a..8f38c8b73 100644
--- a/ui/i18n/src/main/res/values/strings.xml
+++ b/ui/i18n/src/main/res/values/strings.xml
@@ -418,6 +418,8 @@
         <item quantity="one">Every hour</item>
         <item quantity="other">Every %d hours</item>
     </plurals>
+    <string name="battery_optimization_pref_title">Battery Optimization</string>
+    <string name="battery_optimization_pref">For more reliable automatic downloads and automatic refresh, exclude AntennaPod from battery optimization. Tap to add an exception for AntennaPod.</string>
     <string name="pref_followQueue_title">Continuous Playback</string>
     <string name="pref_pauseOnHeadsetDisconnect_title">Headphones or Bluetooth disconnect</string>
     <string name="pref_unpauseOnHeadsetReconnect_title">Headphones Reconnect</string>