diff --git a/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/QuasselViewModel.kt b/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/QuasselViewModel.kt
index 48212a5ad11dab608510ad0f2dd3e2aaf8472008..3b728f75a0ce0551a5b180a15da69b9e3ad5a446 100644
--- a/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/QuasselViewModel.kt
+++ b/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/QuasselViewModel.kt
@@ -166,7 +166,9 @@ class QuasselViewModel : ViewModel() {
                       info = info,
                       network = network,
                       description = user.realName(),
-                      ircUser = user
+                      ircUser =
+                      if (user == IrcUser.NULL) null
+                      else user
                     )
                   }
                 }