diff --git a/app/src/main/java/com/nextcloud/talk/utils/preferences/preferencestorage/DatabaseStorageModule.kt b/app/src/main/java/com/nextcloud/talk/utils/preferences/preferencestorage/DatabaseStorageModule.kt
index 25260e3f4..dabee13d3 100644
--- a/app/src/main/java/com/nextcloud/talk/utils/preferences/preferencestorage/DatabaseStorageModule.kt
+++ b/app/src/main/java/com/nextcloud/talk/utils/preferences/preferencestorage/DatabaseStorageModule.kt
@@ -230,9 +230,9 @@ class DatabaseStorageModule(
                 valueFromDb.value
             }
         } else if (key == "message_notification_level") {
-            return messageNotificationLevel!!
+            return messageNotificationLevel
         } else if (key == "conversation_name") {
-            return conversationNameValue!!
+            return conversationNameValue
         } else if (key == "conversation_password") {
             return ""
         }