diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/disappearingmessages/DisappearingMessagesActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/disappearingmessages/DisappearingMessagesActivity.kt
index d37d42fb9f..2c477afec0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/disappearingmessages/DisappearingMessagesActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/disappearingmessages/DisappearingMessagesActivity.kt
@@ -73,10 +73,11 @@ class DisappearingMessagesActivity: PassphraseRequiredActionBarActivity() {
 
     private fun setUpToolbar() {
         setSupportActionBar(binding.toolbar)
-        val actionBar = supportActionBar ?: return
-        actionBar.title = getString(R.string.activity_disappearing_messages_title)
-        actionBar.setDisplayHomeAsUpEnabled(true)
-        actionBar.setHomeButtonEnabled(true)
+        supportActionBar?.apply {
+            title = getString(R.string.activity_disappearing_messages_title)
+            setDisplayHomeAsUpEnabled(true)
+            setHomeButtonEnabled(true)
+        }
     }
 
     companion object {