diff --git a/lib/matrix_sdk/room.rb b/lib/matrix_sdk/room.rb
index c033ce36d6d899d26aecd7d476a018775fdd6226..5c8356363c2ffc7558268394367e2ea226c6a07d 100644
--- a/lib/matrix_sdk/room.rb
+++ b/lib/matrix_sdk/room.rb
@@ -113,9 +113,8 @@ module MatrixSdk
     end
 
     def to_s
-      prefix = canonical_alias if canonical_alias_has_value?
-      prefix ||= id
-      return "#{prefix} | #{name}" if name_has_value?
+      prefix = canonical_alias || id
+      return "#{prefix} | #{name}" unless name.nil?
 
       prefix
     end