diff --git a/app/src/main/java/net/programmierecke/radiodroid2/FragmentPlayerSmall.java b/app/src/main/java/net/programmierecke/radiodroid2/FragmentPlayerSmall.java
index 5a3cbe1be..2cc9ff453 100644
--- a/app/src/main/java/net/programmierecke/radiodroid2/FragmentPlayerSmall.java
+++ b/app/src/main/java/net/programmierecke/radiodroid2/FragmentPlayerSmall.java
@@ -192,17 +192,28 @@ private void playLastFromHistory() {
 
     private void tryPlayAtStart() {
         boolean play = false;
+	boolean auto_off = false;
 
+        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireContext().getApplicationContext());
         if (!firstPlayAttempted && PlayerServiceUtil.isServiceBound()) {
             firstPlayAttempted = true;
 
             if (!PlayerServiceUtil.isPlaying()) {
-                SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireContext().getApplicationContext());
                 play = sharedPreferences.getBoolean("auto_play_on_startup", false);
             }
         }
 
         if (play) {
+            auto_off = sharedPreferences.getBoolean("auto_off_on_startup", false);
+            if (auto_off) {
+                int timeout;
+                try {
+                    timeout = Integer.parseInt(sharedPreferences.getString("auto_off_timeout", "10"));
+                } catch(Exception e) {
+                    timeout=10;
+                }
+                PlayerServiceUtil.addTimer(timeout * 60);
+            }
             playLastFromHistory();
         }
     }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b1a5b2ed0..b80d1722e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -145,6 +145,11 @@
     <string name="settings_auto_play_on_startup">Auto-play</string>
     <string name="settings_auto_play_on_startup_on">Play last station on startup</string>
     <string name="settings_auto_play_on_startup_off">Do not play last station on startup</string>
+    <string name="settings_auto_off_on_startup">Auto-stop</string>
+    <string name="settings_auto_off_on_startup_on">Use Auto-stop timer with auto-play</string>
+    <string name="settings_auto_off_on_startup_off">Do not use Auto-stop timer with auto-play</string>
+    <string name="settings_auto_off_sleep_timer">Auto-stop timer</string>
+    <string name="settings_auto_off_sleep_timer_desc">Stop playing after %1$s minutes</string>
     <string name="settings_play_external">Enable external player</string>
     <string name="settings_play_external_desc_on">Play stations with external player</string>
     <string name="settings_play_external_desc_off">Play stations with RadioDroid</string>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index b1484971c..5f3e959f3 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -57,6 +57,25 @@
             android:summaryOff="@string/settings_auto_play_on_startup_off"
             android:summaryOn="@string/settings_auto_play_on_startup_on"
             android:title="@string/settings_auto_play_on_startup" />
+
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:key="auto_off_on_startup"
+            android:dependency="auto_play_on_startup"
+            android:summaryOff="@string/settings_auto_off_on_startup_off"
+            android:summaryOn="@string/settings_auto_off_on_startup_on"
+            android:title="@string/settings_auto_off_on_startup" />
+
+        <ListPreference
+            android:defaultValue="10"
+            android:dependency="auto_off_on_startup"
+            android:entries="@array/timeout_minutes"
+            android:entryValues="@array/timeout_minutes_values"
+            android:key="auto_off_timeout"
+            android:summary="@string/settings_auto_off_sleep_timer_desc"
+            search:summary=""
+            android:title="@string/settings_auto_off_sleep_timer" />
+
     </PreferenceScreen>
 
     <PreferenceScreen android:title="@string/settings_interaction"