diff --git a/app/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/RoomTopicItemFactory.kt b/app/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/RoomTopicItemFactory.kt
index a8f0647cdd..3d67eb59f4 100644
--- a/app/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/RoomTopicItemFactory.kt
+++ b/app/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/RoomTopicItemFactory.kt
@@ -1,6 +1,5 @@
 package im.vector.riotredesign.features.home.room.detail.timeline
 
-import android.text.TextUtils
 import im.vector.matrix.android.api.session.events.model.TimelineEvent
 import im.vector.matrix.android.api.session.events.model.toModel
 import im.vector.matrix.android.api.session.room.model.RoomTopicContent
@@ -16,10 +15,10 @@ class RoomTopicItemFactory(private val stringProvider: StringProvider) {
         if (content == null || roomMember == null) {
             return null
         }
-        val text = if (!TextUtils.isEmpty(content.topic)) {
-            stringProvider.getString(R.string.notice_room_topic_changed, roomMember.displayName, content.topic)
-        } else {
+        val text = if (content.topic.isNullOrEmpty()) {
             stringProvider.getString(R.string.notice_room_topic_removed, roomMember.displayName)
+        } else {
+            stringProvider.getString(R.string.notice_room_topic_changed, roomMember.displayName, content.topic)
         }
         return NoticeItem(text, roomMember.avatarUrl, roomMember.displayName)
     }
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomTopicContent.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomTopicContent.kt
index 5967e93483..16b18de903 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomTopicContent.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomTopicContent.kt
@@ -5,5 +5,5 @@ import com.squareup.moshi.JsonClass
 
 @JsonClass(generateAdapter = true)
 data class RoomTopicContent(
-        @Json(name = "topic") val topic: String
+        @Json(name = "topic") val topic: String? = null
 )
\ No newline at end of file