diff --git a/app/build.gradle b/app/build.gradle
index b34b5d26e..053142c2f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -39,8 +39,8 @@ android {
         targetSdkVersion 29
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
-        versionCode 125
-        versionName "8.0.0beta3"
+        versionCode 126
+        versionName "8.0.0beta4"
 
         flavorDimensions "default"
         renderscriptTargetApi 19
diff --git a/app/gplay/release/output.json b/app/gplay/release/output.json
deleted file mode 100644
index 6cd8f9f17..000000000
--- a/app/gplay/release/output.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":116,"versionName":"8.0.0beta1","enabled":true,"outputFile":"app-gplay-release.apk","fullName":"gplayRelease","baseName":"gplay-release"},"path":"app-gplay-release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
index 99419b3ad..6b528debb 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
@@ -558,19 +558,21 @@ class ChatController(args: Bundle) : BaseController(args), MessagesListAdapter
 
     private fun setupMentionAutocomplete() {
         val elevation = 6f
-        val backgroundDrawable = ColorDrawable(resources!!.getColor(R.color.bg_default))
-        val presenter = MentionAutocompletePresenter(applicationContext, roomToken)
-        val callback = MentionAutocompleteCallback(activity,
-                conversationUser, messageInput)
+        resources?.let {
+            val backgroundDrawable = ColorDrawable(it.getColor(R.color.bg_default))
+            val presenter = MentionAutocompletePresenter(applicationContext, roomToken)
+            val callback = MentionAutocompleteCallback(activity,
+                    conversationUser, messageInput)
 
-        if (mentionAutocomplete == null && messageInput != null) {
-            mentionAutocomplete = Autocomplete.on<Mention>(messageInput)
-                    .with(elevation)
-                    .with(backgroundDrawable)
-                    .with(MagicCharPolicy('@'))
-                    .with(presenter)
-                    .with(callback)
-                    .build()
+            if (mentionAutocomplete == null && messageInput != null) {
+                mentionAutocomplete = Autocomplete.on<Mention>(messageInput)
+                        .with(elevation)
+                        .with(backgroundDrawable)
+                        .with(MagicCharPolicy('@'))
+                        .with(presenter)
+                        .with(callback)
+                        .build()
+            }
         }
     }