diff --git a/Clover/app/src/main/java/org/floens/chan/core/manager/WatchManager.java b/Clover/app/src/main/java/org/floens/chan/core/manager/WatchManager.java
index cc8e4927..9e98897d 100644
--- a/Clover/app/src/main/java/org/floens/chan/core/manager/WatchManager.java
+++ b/Clover/app/src/main/java/org/floens/chan/core/manager/WatchManager.java
@@ -245,6 +245,9 @@ public class WatchManager {
     public void onEvent(Chan.ForegroundChangedMessage message) {
         updateNotificationServiceState();
         updateTimerState(true);
+        if (!message.inForeground) {
+            updateDatabase();
+        }
     }
 
     public void onWatchEnabledChanged(boolean watchEnabled) {
diff --git a/Clover/app/src/main/java/org/floens/chan/ui/activity/StartActivity.java b/Clover/app/src/main/java/org/floens/chan/ui/activity/StartActivity.java
index 05306be3..e8dbde23 100644
--- a/Clover/app/src/main/java/org/floens/chan/ui/activity/StartActivity.java
+++ b/Clover/app/src/main/java/org/floens/chan/ui/activity/StartActivity.java
@@ -227,13 +227,6 @@ public class StartActivity extends AppCompatActivity {
         Chan.getInstance().activityEnteredBackground();
     }
 
-    @Override
-    protected void onPause() {
-        super.onPause();
-
-        Chan.getWatchManager().updateDatabase();
-    }
-
     private Controller stackTop() {
         return stack.get(stack.size() - 1);
     }