diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Home.java b/app/src/main/java/com/eveningoutpost/dexdrip/Home.java
index 53e9b57439..87558f25d7 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Home.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/Home.java
@@ -2268,8 +2268,11 @@ public void deleteAllBG(MenuItem myitem) {
     }
 
     public void checkForUpdate(MenuItem myitem) {
-        toast(getString(R.string.checking_for_update));
-        UpdateActivity.checkForAnUpdate(getApplicationContext());
+        if (JoH.ratelimit("manual-update-check",5)) {
+            toast(getString(R.string.checking_for_update));
+            UpdateActivity.last_check_time = -1;
+            UpdateActivity.checkForAnUpdate(getApplicationContext());
+        }
     }
 
     public void sendFeedback(MenuItem myitem) {
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Services/DailyIntentService.java b/app/src/main/java/com/eveningoutpost/dexdrip/Services/DailyIntentService.java
index bc4845f5c6..201ebd1e26 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Services/DailyIntentService.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/Services/DailyIntentService.java
@@ -2,9 +2,13 @@
 
 import android.app.IntentService;
 import android.content.Intent;
+import android.os.PowerManager;
 
+import com.eveningoutpost.dexdrip.Models.JoH;
 import com.eveningoutpost.dexdrip.Models.UserError;
 
+import static com.eveningoutpost.dexdrip.UtilityModels.UpdateActivity.checkForAnUpdate;
+
 public class DailyIntentService extends IntentService {
     // DAILY TASKS CAN GO IN HERE!
 
@@ -14,7 +18,18 @@ public DailyIntentService() {
 
     @Override
     protected void onHandleIntent(Intent intent) {
-        UserError.cleanup();
+        final PowerManager.WakeLock wl = JoH.getWakeLock("DailyIntentService", 120000);
+        try {
+            UserError.cleanup();
+        } catch (Exception e) {
+            //
+        }
+        try {
+            checkForAnUpdate(getApplicationContext());
+        } catch (Exception e) {
+            //
+        }
+        JoH.releaseWakeLock(wl);
     }
 
-  }
+}
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/UpdateActivity.java b/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/UpdateActivity.java
index fed76cf96f..d5e09e9121 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/UpdateActivity.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/UpdateActivity.java
@@ -73,7 +73,7 @@ public static void checkForAnUpdate(final Context context) {
         if (!prefs.getBoolean(autoUpdatePrefsName, true)) return;
         if (last_check_time == 0)
             last_check_time = (double) prefs.getLong(last_update_check_time, 0);
-        if (((JoH.ts() - last_check_time) > 86400000) || (debug)) {
+        if (((JoH.ts() - last_check_time) > 86300000) || (debug)) {
             last_check_time = JoH.ts();
             prefs.edit().putLong(last_update_check_time, (long) last_check_time).apply();