diff --git a/ElementX/Sources/Mocks/Generated/GeneratedMocks.swift b/ElementX/Sources/Mocks/Generated/GeneratedMocks.swift
index c15350f19..ee3128987 100644
--- a/ElementX/Sources/Mocks/Generated/GeneratedMocks.swift
+++ b/ElementX/Sources/Mocks/Generated/GeneratedMocks.swift
@@ -15294,11 +15294,6 @@ class RoomInfoProxyMock: RoomInfoProxyProtocol, @unchecked Sendable {
         set(value) { underlyingIsFavourite = value }
     }
     var underlyingIsFavourite: Bool!
-    var isDM: Bool {
-        get { return underlyingIsDM }
-        set(value) { underlyingIsDM = value }
-    }
-    var underlyingIsDM: Bool!
     var canonicalAlias: String?
     var alternativeAliases: [String] = []
     var membership: Membership {
diff --git a/ElementX/Sources/Mocks/JoinedRoomProxyMock.swift b/ElementX/Sources/Mocks/JoinedRoomProxyMock.swift
index fe6c33a85..30302bbdc 100644
--- a/ElementX/Sources/Mocks/JoinedRoomProxyMock.swift
+++ b/ElementX/Sources/Mocks/JoinedRoomProxyMock.swift
@@ -182,7 +182,6 @@ extension RoomInfoProxyMock {
         activeMembersCount = configuration.members.filter { $0.membership == .join || $0.membership == .invite }.count
         invitedMembersCount = configuration.members.filter { $0.membership == .invite }.count
         joinedMembersCount = configuration.members.filter { $0.membership == .join }.count
-        isDM = configuration.isDirect && activeMembersCount <= 2
         highlightCount = 0
         notificationCount = 0
         cachedUserDefinedNotificationMode = .allMessages
diff --git a/ElementX/Sources/Other/Extensions/ClientBuilder.swift b/ElementX/Sources/Other/Extensions/ClientBuilder.swift
index fc6fa9aaa..f22837b29 100644
--- a/ElementX/Sources/Other/Extensions/ClientBuilder.swift
+++ b/ElementX/Sources/Other/Extensions/ClientBuilder.swift
@@ -29,7 +29,6 @@ extension ClientBuilder {
                                          timeout: requestTimeout,
                                          maxConcurrentRequests: nil,
                                          maxRetryTime: maxRequestRetryTime))
-            .dmRoomDefinition(dmRoomDefinition: .twoMembers)
         
         builder = switch slidingSync {
         case .restored: builder
diff --git a/ElementX/Sources/Services/Room/RoomInfoProxy.swift b/ElementX/Sources/Services/Room/RoomInfoProxy.swift
index 2c1c910f6..f6ab6d825 100644
--- a/ElementX/Sources/Services/Room/RoomInfoProxy.swift
+++ b/ElementX/Sources/Services/Room/RoomInfoProxy.swift
@@ -54,10 +54,6 @@ struct RoomInfoProxy: RoomInfoProxyProtocol {
         roomInfo.isSpace
     }
     
-    var isDM: Bool {
-        roomInfo.isDm
-    }
-    
     var successor: SuccessorRoom? {
         roomInfo.successorRoom
     }
diff --git a/ElementX/Sources/Services/Room/RoomInfoProxyProtocol.swift b/ElementX/Sources/Services/Room/RoomInfoProxyProtocol.swift
index 73767319b..a329ba197 100644
--- a/ElementX/Sources/Services/Room/RoomInfoProxyProtocol.swift
+++ b/ElementX/Sources/Services/Room/RoomInfoProxyProtocol.swift
@@ -38,7 +38,6 @@ protocol RoomInfoProxyProtocol: BaseRoomInfoProxyProtocol {
     var isDirect: Bool { get }
     var isSpace: Bool { get }
     var isFavourite: Bool { get }
-    var isDM: Bool { get }
     
     var canonicalAlias: String? { get }
     var alternativeAliases: [String] { get }
diff --git a/ElementX/Sources/Services/Room/RoomProxyProtocol.swift b/ElementX/Sources/Services/Room/RoomProxyProtocol.swift
index 1f4cdf871..6d67a1f5f 100644
--- a/ElementX/Sources/Services/Room/RoomProxyProtocol.swift
+++ b/ElementX/Sources/Services/Room/RoomProxyProtocol.swift
@@ -224,7 +224,7 @@ extension JoinedRoomProxyProtocol {
     }
     
     var isDirectOneToOneRoom: Bool {
-        infoPublisher.value.isDM
+        infoPublisher.value.isDirect && infoPublisher.value.activeMembersCount <= 2
     }
 
     func members() async -> [RoomMemberProxyProtocol]? {