diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/ChatActivity.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/ChatActivity.kt
index 9364648d88b59411af8c7d3a8dfd833d817e4350..51e4770361a76e9b0e1d223e7e43608a7bcff616 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/ChatActivity.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/ChatActivity.kt
@@ -148,8 +148,11 @@ class ChatActivity : ServiceBoundActivity(), SharedPreferences.OnSharedPreferenc
     if (intent != null) {
       when {
         intent.type == "text/plain"                                     -> {
-          chatlineFragment?.replaceText(intent.getStringExtra(Intent.EXTRA_TEXT))
-          drawerLayout.closeDrawers()
+          val text = intent.getCharSequenceExtra(Intent.EXTRA_TEXT)
+          if (text != null) {
+            chatlineFragment?.replaceText(text)
+            drawerLayout.closeDrawers()
+          }
         }
         intent.hasExtra(KEY_BUFFER_ID)                                  -> {
           viewModel.buffer.onNext(intent.getIntExtra(KEY_BUFFER_ID, -1))