diff --git a/app/src/main/java/org/communiquons/android/comunic/client/data/conversations/ConversationMessage.java b/app/src/main/java/org/communiquons/android/comunic/client/data/conversations/ConversationMessage.java
index fee1a7e..5f9ba07 100644
--- a/app/src/main/java/org/communiquons/android/comunic/client/data/conversations/ConversationMessage.java
+++ b/app/src/main/java/org/communiquons/android/comunic/client/data/conversations/ConversationMessage.java
@@ -127,8 +127,9 @@ public class ConversationMessage {
      *
      * @return The content
      */
+    @NonNull
     public String getContent() {
-        return content;
+        return content != null ? content : "";
     }
 
     /**