diff --git a/app/src/main/java/com/nextcloud/talk/conversationinfo/viewmodel/ConversationInfoViewModel.kt b/app/src/main/java/com/nextcloud/talk/conversationinfo/viewmodel/ConversationInfoViewModel.kt
index a9ed147e7..10f395026 100644
--- a/app/src/main/java/com/nextcloud/talk/conversationinfo/viewmodel/ConversationInfoViewModel.kt
+++ b/app/src/main/java/com/nextcloud/talk/conversationinfo/viewmodel/ConversationInfoViewModel.kt
@@ -18,7 +18,6 @@ import com.nextcloud.talk.chat.data.network.ChatNetworkDataSource
 import com.nextcloud.talk.data.user.model.User
 import com.nextcloud.talk.models.domain.ConversationModel
 import com.nextcloud.talk.models.json.capabilities.SpreedCapability
-import com.nextcloud.talk.models.json.generic.GenericOverall
 import com.nextcloud.talk.models.json.participants.TalkBan
 import com.nextcloud.talk.repositories.conversations.ConversationsRepository
 import com.nextcloud.talk.utils.ApiUtils
diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/SetStatusDialogFragment.kt b/app/src/main/java/com/nextcloud/talk/ui/dialog/SetStatusDialogFragment.kt
index 567c16af3..a411de7d5 100644
--- a/app/src/main/java/com/nextcloud/talk/ui/dialog/SetStatusDialogFragment.kt
+++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/SetStatusDialogFragment.kt
@@ -176,18 +176,22 @@ class SetStatusDialogFragment :
                 @SuppressLint("NotifyDataSetChanged")
                 override fun onNext(statusOverall: StatusOverall) {
                     if (statusOverall.ocs?.meta?.statusCode == HTTP_STATUS_CODE_OK) {
-                        backupStatus = statusOverall.ocs?.data!!
-                        isBackupStatusAvailable = true
-                        val backupPredefinedStatus = PredefinedStatus(
-                            backupStatus.userId!!,
-                            backupStatus.icon,
-                            backupStatus.message!!,
-                            ClearAt(type = "period", time = backupStatus.clearAt.toString())
-                        )
-                        binding.automaticStatus.visibility = View.VISIBLE
-                        adapter.isBackupStatusAvailable = true
-                        predefinedStatusesList.add(0, backupPredefinedStatus)
-                        adapter.notifyDataSetChanged()
+                        statusOverall.ocs?.data?.let { status ->
+                            backupStatus = status
+                            if (backupStatus.message != null) {
+                                isBackupStatusAvailable = true
+                                val backupPredefinedStatus = PredefinedStatus(
+                                    backupStatus.userId!!,
+                                    backupStatus.icon,
+                                    backupStatus.message!!,
+                                    ClearAt(type = "period", time = backupStatus.clearAt.toString())
+                                )
+                                binding.automaticStatus.visibility = View.VISIBLE
+                                adapter.isBackupStatusAvailable = true
+                                predefinedStatusesList.add(0, backupPredefinedStatus)
+                                adapter.notifyDataSetChanged()
+                            }
+                        }
                     }
                 }