diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/ChatlineFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/ChatlineFragment.kt
index e7f3188b5addbd9d11a2b286d91b6d7ff5b0f948..6d91961bf104af5a4725bdba9feb5c7960ddb0f4 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/ChatlineFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/ChatlineFragment.kt
@@ -176,13 +176,15 @@ class ChatlineFragment : ServiceBoundFragment() {
           } to ircFormatSerializer.toEscapeCodes(SpannableString(it))
         }
 
+        for ((stripped, _) in lines) {
+          viewModel.addRecentlySentMessage(stripped)
+        }
         viewModel.session { sessionOptional ->
           val session = sessionOptional.orNull()
           viewModel.buffer { bufferId ->
             session?.bufferSyncer?.bufferInfo(bufferId)?.also { bufferInfo ->
               val output = mutableListOf<IAliasManager.Command>()
-              for ((stripped, formatted) in lines) {
-                viewModel.addRecentlySentMessage(stripped)
+              for ((_, formatted) in lines) {
                 session.aliasManager?.processInput(bufferInfo, formatted, output)
               }
               for (command in output) {