diff --git a/app/build.gradle b/app/build.gradle
index 25dd4779f..4bda40820 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,8 +15,8 @@ android {
         targetSdkVersion 27
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
-        versionCode 53
-        versionName "3.0.0beta2"
+        versionCode 54
+        versionName "3.0.0beta3"
 
         flavorDimensions "default"
         renderscriptTargetApi 19
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/converters/EnumSystemMessageTypeConverter.java b/app/src/main/java/com/nextcloud/talk/models/json/converters/EnumSystemMessageTypeConverter.java
index 110484642..ca4f506af 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/converters/EnumSystemMessageTypeConverter.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/converters/EnumSystemMessageTypeConverter.java
@@ -80,6 +80,10 @@ public class EnumSystemMessageTypeConverter extends StringBasedTypeConverter<Cha
     @Override
     public String convertToString(ChatMessage.SystemMessageType object) {
 
+        if (object == null) {
+            return "";
+        }
+
         switch (object) {
             case CONVERSATION_CREATED:
                 return "conversation_created";