diff --git a/build.gradle b/build.gradle
index 30e32e9a05..b0fae2f563 100644
--- a/build.gradle
+++ b/build.gradle
@@ -182,7 +182,7 @@ dependencies {
     testImplementation 'org.robolectric:shadows-multidex:4.2'
 }
 
-def canonicalVersionCode = 98
+def canonicalVersionCode = 99
 def canonicalVersionName = "1.5.4"
 
 def postFixSize = 10
diff --git a/src/org/thoughtcrime/securesms/ApplicationContext.java b/src/org/thoughtcrime/securesms/ApplicationContext.java
index 486e06e23e..43c2c7f760 100644
--- a/src/org/thoughtcrime/securesms/ApplicationContext.java
+++ b/src/org/thoughtcrime/securesms/ApplicationContext.java
@@ -216,7 +216,9 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
     resubmitProfilePictureIfNeeded();
     publicChatManager = new PublicChatManager(this);
     updateOpenGroupProfilePicturesIfNeeded();
-    registerForFCMIfNeeded(false);
+    if (userPublicKey != null) {
+      registerForFCMIfNeeded(false);
+    }
     // Set application UI mode (day/night theme) to the user selected one.
     UiModeUtilities.setupUiModeToUserSelected(this);
     // ========
diff --git a/src/org/thoughtcrime/securesms/database/MmsDatabase.java b/src/org/thoughtcrime/securesms/database/MmsDatabase.java
index 97a59c5007..eccb3600cb 100644
--- a/src/org/thoughtcrime/securesms/database/MmsDatabase.java
+++ b/src/org/thoughtcrime/securesms/database/MmsDatabase.java
@@ -914,7 +914,7 @@ public class MmsDatabase extends MessagingDatabase {
       type |= Types.EXPIRATION_TIMER_UPDATE_BIT;
     }
 
-    return insertMessageInbox(retrieved, "", threadId, type, 0);
+    return insertMessageInbox(retrieved, "", threadId, type, serverTimestamp);
   }
 
   public Optional<InsertResult> insertSecureDecryptedMessageInbox(IncomingMediaMessage retrieved, long threadId)
diff --git a/src/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt
index e0bba59ccf..5c81027f7d 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt
@@ -172,6 +172,7 @@ class HomeActivity : PassphraseRequiredActionBarActivity, ConversationClickListe
         SessionManagementProtocol.configureIfNeeded(sessionResetImpl, sskDatabase, application)
         MultiDeviceProtocol.configureIfNeeded(apiDB)
         IP2Country.configureIfNeeded(this)
+        application.registerForFCMIfNeeded(false)
         // Preload device links to make message sending quicker
         val publicKeys = ContactUtilities.getAllContacts(this).filter { contact ->
             !contact.recipient.isGroupRecipient && !contact.isOurDevice && !contact.isSlave
diff --git a/src/org/thoughtcrime/securesms/loki/activities/PNModeActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/PNModeActivity.kt
index 75102938b9..03e0dec356 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/PNModeActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/PNModeActivity.kt
@@ -158,7 +158,6 @@ class PNModeActivity : BaseActionBarActivity() {
         val application = ApplicationContext.getInstance(this)
         application.setUpStorageAPIIfNeeded()
         application.setUpP2PAPIIfNeeded()
-        application.registerForFCMIfNeeded(true)
         val intent = Intent(this, HomeActivity::class.java)
         intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
         show(intent)