diff --git a/app/src/main/java/org/fdroid/fdroid/views/PreferencesFragment.java b/app/src/main/java/org/fdroid/fdroid/views/PreferencesFragment.java
index 16b53ae2f..34dbcbf8a 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/PreferencesFragment.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/PreferencesFragment.java
@@ -266,7 +266,10 @@ public class PreferencesFragment extends PreferenceFragmentCompat
     private String getUpdateIntervalSeekbarSummary(int position) {
         StringBuilder sb = new StringBuilder();
         sb.append(getString(UPDATE_INTERVAL_NAMES[position]));
-        if (nextUpdateCheck < Long.MAX_VALUE) {
+        if (nextUpdateCheck < 0) {
+            sb.append("\n");
+            sb.append(getString(R.string.auto_update_time_past));
+        } else if (nextUpdateCheck < Long.MAX_VALUE) {
             sb.append("\n");
             CharSequence nextUpdate = DateUtils.getRelativeTimeSpanString(nextUpdateCheck,
                     System.currentTimeMillis(), DateUtils.MINUTE_IN_MILLIS, DateUtils.FORMAT_ABBREV_RELATIVE);
diff --git a/app/src/main/java/org/fdroid/fdroid/work/RepoUpdateWorker.kt b/app/src/main/java/org/fdroid/fdroid/work/RepoUpdateWorker.kt
index dacf34211..39aaa0b1a 100644
--- a/app/src/main/java/org/fdroid/fdroid/work/RepoUpdateWorker.kt
+++ b/app/src/main/java/org/fdroid/fdroid/work/RepoUpdateWorker.kt
@@ -87,7 +87,6 @@ class RepoUpdateWorker(
                     NetworkType.UNMETERED
                 }
                 val constraints = Constraints.Builder()
-                    .setRequiresDeviceIdle(true)
                     .setRequiresBatteryNotLow(true)
                     .setRequiresStorageNotLow(true)
                     .setRequiredNetworkType(networkType)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7c3029c75..8606a1567 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -679,6 +679,7 @@ This often occurs with apps installed via Google Play or other sources, if they
     <string name="interval_2w">Check for updates every 2 weeks</string>
     <!-- "updates" as in software updates -->
     <string name="auto_update_time">Earliest next update: %s</string>
+    <string name="auto_update_time_past">Next update when conditions are fulfilled</string>
 
     <string name="keep_hour">1 Hour</string>
     <string name="keep_day">1 Day</string>