diff --git a/src/org/thoughtcrime/securesms/revealable/RevealableMessageManager.java b/src/org/thoughtcrime/securesms/revealable/RevealableMessageManager.java
index 9d7df2f8ba..9d6ec868a2 100644
--- a/src/org/thoughtcrime/securesms/revealable/RevealableMessageManager.java
+++ b/src/org/thoughtcrime/securesms/revealable/RevealableMessageManager.java
@@ -32,6 +32,8 @@ public class RevealableMessageManager extends TimedEventManager<RevealExpiration
 
     this.mmsDatabase        = DatabaseFactory.getMmsDatabase(application);
     this.attachmentDatabase = DatabaseFactory.getAttachmentDatabase(application);
+    
+    scheduleIfNecessary();
   }
 
   @WorkerThread
diff --git a/src/org/thoughtcrime/securesms/service/TimedEventManager.java b/src/org/thoughtcrime/securesms/service/TimedEventManager.java
index 9778ecab4e..ab7bbc31b0 100644
--- a/src/org/thoughtcrime/securesms/service/TimedEventManager.java
+++ b/src/org/thoughtcrime/securesms/service/TimedEventManager.java
@@ -29,10 +29,6 @@ public abstract class TimedEventManager<E> {
 
     this.application = application;
     this.handler     = new Handler(handlerThread.getLooper());
-
-    // XXX Have to delay it because some devices will run the resulting handler#post synchronously,
-    //     triggering a method call to an uninitialized child class.
-    handler.postDelayed(this::scheduleIfNecessary, 5);
   }
 
   /**