diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 403c12d324..2b53834d85 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -610,7 +610,7 @@
     <activity android:name=".conversation.v2.ConversationActivity"
               android:windowSoftInputMode="stateUnchanged"
               android:launchMode="singleTask"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"
               android:parentActivityName=".MainActivity"
               android:resizeableActivity="true"
               android:exported="false">
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivity.kt
index c3fd893a7d..8441ac3bcd 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivity.kt
@@ -7,6 +7,8 @@ import android.view.Window
 import androidx.activity.viewModels
 import io.reactivex.rxjava3.subjects.PublishSubject
 import io.reactivex.rxjava3.subjects.Subject
+import org.signal.core.util.logging.Log
+import org.signal.core.util.logging.Log.tag
 import org.thoughtcrime.securesms.PassphraseRequiredActivity
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentComponent
@@ -24,6 +26,8 @@ import java.util.concurrent.TimeUnit
 open class ConversationActivity : PassphraseRequiredActivity(), VoiceNoteMediaControllerOwner, InAppPaymentComponent {
 
   companion object {
+    private val TAG = tag(ConversationActivity::class.java)
+
     private const val STATE_WATERMARK = "share_data_watermark"
   }
 
@@ -70,6 +74,13 @@ open class ConversationActivity : PassphraseRequiredActivity(), VoiceNoteMediaCo
     outState.putLong(STATE_WATERMARK, shareDataTimestampViewModel.timestamp)
   }
 
+  override fun onStop() {
+    super.onStop()
+    if (isChangingConfigurations) {
+      Log.i(TAG, "Conversation recreating due to configuration change")
+    }
+  }
+
   override fun onDestroy() {
     super.onDestroy()
     transitionDebouncer.clear()