diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java
index ccc55393e5..7071b087c2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java
@@ -3272,7 +3272,10 @@ public class ConversationActivity extends PassphraseRequiredActivity
   }
 
   private void presentMessageRequestDisplayState(@NonNull MessageRequestViewModel.DisplayState displayState) {
-    if (getIntent().hasExtra(TEXT_EXTRA) || getIntent().hasExtra(MEDIA_EXTRA) || getIntent().hasExtra(STICKER_EXTRA)) {
+    if ((getIntent().hasExtra(TEXT_EXTRA) && !Util.isEmpty(getIntent().getStringExtra(TEXT_EXTRA))) ||
+         getIntent().hasExtra(MEDIA_EXTRA)                                                          ||
+         getIntent().hasExtra(STICKER_EXTRA))
+    {
       Log.d(TAG, "[presentMessageRequestDisplayState] Have extra, so ignoring provided state.");
       messageRequestBottomView.setVisibility(View.GONE);
     } else if (isPushGroupV1Conversation() && !isActiveGroup()) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/MiscellaneousValues.java b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/MiscellaneousValues.java
index 1a49d01f62..e3ceecaac0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/MiscellaneousValues.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/MiscellaneousValues.java
@@ -16,7 +16,7 @@ public final class MiscellaneousValues extends SignalStoreValues {
 
   @Override
   void onFirstEverAppLaunch() {
-    putLong(MESSAGE_REQUEST_ENABLE_TIME, System.currentTimeMillis());
+    putLong(MESSAGE_REQUEST_ENABLE_TIME, 0);
   }
 
   public long getLastPrekeyRefreshTime() {
@@ -28,7 +28,7 @@ public final class MiscellaneousValues extends SignalStoreValues {
   }
 
   public long getMessageRequestEnableTime() {
-    return getLong(MESSAGE_REQUEST_ENABLE_TIME, System.currentTimeMillis());
+    return getLong(MESSAGE_REQUEST_ENABLE_TIME, 0);
   }
 
   public long getLastProfileRefreshTime() {