diff --git a/Session/Conversations/Settings/ThreadDisappearingMessagesViewModel.swift b/Session/Conversations/Settings/ThreadDisappearingMessagesViewModel.swift
index 886cc326a..a562ee556 100644
--- a/Session/Conversations/Settings/ThreadDisappearingMessagesViewModel.swift
+++ b/Session/Conversations/Settings/ThreadDisappearingMessagesViewModel.swift
@@ -98,7 +98,12 @@ class ThreadDisappearingMessagesViewModel: SessionTableViewModel<ThreadDisappear
     /// fetch (after the ones in `ValueConcurrentObserver.asyncStart`/`ValueConcurrentObserver.syncStart`)
     /// just in case the database has changed between the two reads - unfortunately it doesn't look like there is a way to prevent this
     private lazy var _observableSettingsData: ObservableData = ValueObservation
-        .trackingConstantRegion { [weak self, config] db -> [SectionModel] in
+        .trackingConstantRegion { [weak self, config, dependencies, threadId = self.threadId] db -> [SectionModel] in
+            let userPublicKey: String = getUserHexEncodedPublicKey(db, dependencies: dependencies)
+            let maybeThreadViewModel: SessionThreadViewModel? = try SessionThreadViewModel
+                .conversationSettingsQuery(threadId: threadId, userPublicKey: userPublicKey)
+                .fetchOne(db)
+            
             return [
                 SectionModel(
                     model: .content,
@@ -109,6 +114,10 @@ class ThreadDisappearingMessagesViewModel: SessionTableViewModel<ThreadDisappear
                             rightAccessory: .radio(
                                 isSelected: { (self?.currentSelection.value == 0) }
                             ),
+                            isEnabled: (
+                                maybeThreadViewModel?.threadVariant != .closedGroup ||
+                                maybeThreadViewModel?.currentUserIsClosedGroupMember == true
+                            ),
                             onTap: { self?.currentSelection.send(0) }
                         )
                     ].appending(
@@ -122,6 +131,10 @@ class ThreadDisappearingMessagesViewModel: SessionTableViewModel<ThreadDisappear
                                     rightAccessory: .radio(
                                         isSelected: { (self?.currentSelection.value == duration) }
                                     ),
+                                    isEnabled: (
+                                        maybeThreadViewModel?.threadVariant != .closedGroup ||
+                                        maybeThreadViewModel?.currentUserIsClosedGroupMember == true
+                                    ),
                                     onTap: { self?.currentSelection.send(duration) }
                                 )
                             }
diff --git a/Session/Shared/Views/SessionCell+AccessoryView.swift b/Session/Shared/Views/SessionCell+AccessoryView.swift
index dffda5793..5b43c9cd0 100644
--- a/Session/Shared/Views/SessionCell+AccessoryView.swift
+++ b/Session/Shared/Views/SessionCell+AccessoryView.swift
@@ -301,19 +301,33 @@ extension SessionCell {
                     let wasOldSelection: Bool = (!isSelected && storedSelection)
                     
                     radioBorderView.isHidden = false
-                    radioBorderView.themeBorderColor = (isSelected ?
-                        .radioButton_selectedBorder :
-                        .radioButton_unselectedBorder
-                    )
+                    radioBorderView.themeBorderColor = {
+                        guard isEnabled else { return .radioButton_disabledBorder }
+                        
+                        return (isSelected ?
+                            .radioButton_selectedBorder :
+                            .radioButton_unselectedBorder
+                        )
+                    }()
+                    
                     radioBorderView.layer.cornerRadius = (size.borderSize / 2)
                     
                     radioView.accessibilityLabel = accessibilityLabel
                     radioView.alpha = (wasOldSelection ? 0.3 : 1)
                     radioView.isHidden = (!isSelected && !storedSelection)
-                    radioView.themeBackgroundColor = (isSelected || wasOldSelection ?
-                        .radioButton_selectedBackground :
-                        .radioButton_unselectedBackground
-                    )
+                    radioView.themeBackgroundColor = {
+                        guard isEnabled else {
+                            return (isSelected || wasOldSelection ?
+                                .radioButton_disabledSelectedBackground :
+                                .radioButton_disabledUnselectedBackground
+                            )
+                        }
+                        
+                        return (isSelected || wasOldSelection ?
+                            .radioButton_selectedBackground :
+                            .radioButton_unselectedBackground
+                        )
+                    }()
                     radioView.layer.cornerRadius = (size.selectionSize / 2)
                     
                     radioViewWidthConstraint.constant = size.selectionSize
diff --git a/SessionMessagingKit/Shared Models/SessionThreadViewModel.swift b/SessionMessagingKit/Shared Models/SessionThreadViewModel.swift
index 01c249d6f..f609ea97d 100644
--- a/SessionMessagingKit/Shared Models/SessionThreadViewModel.swift	
+++ b/SessionMessagingKit/Shared Models/SessionThreadViewModel.swift	
@@ -857,10 +857,6 @@ public extension SessionThreadViewModel {
         
         let profileIdColumnLiteral: SQL = SQL(stringLiteral: Profile.Columns.id.name)
         
-        let groupMemberProfileIdColumnLiteral: SQL = SQL(stringLiteral: GroupMember.Columns.profileId.name)
-        let groupMemberRoleColumnLiteral: SQL = SQL(stringLiteral: GroupMember.Columns.role.name)
-        let groupMemberGroupIdColumnLiteral: SQL = SQL(stringLiteral: GroupMember.Columns.groupId.name)
-        
         /// **Note:** The `numColumnsBeforeProfiles` value **MUST** match the number of fields before
         /// the `ViewModel.contactProfileKey` entry below otherwise the query will fail to
         /// parse and might throw
@@ -887,8 +883,27 @@ public extension SessionThreadViewModel {
                 \(ViewModel.closedGroupProfileBackFallbackKey).*,
                 
                 \(closedGroup[.name]) AS \(ViewModel.closedGroupNameKey),
-                (\(ViewModel.currentUserIsClosedGroupMemberKey).profileId IS NOT NULL) AS \(ViewModel.currentUserIsClosedGroupMemberKey),
-                (\(ViewModel.currentUserIsClosedGroupAdminKey).profileId IS NOT NULL) AS \(ViewModel.currentUserIsClosedGroupAdminKey),
+                
+                EXISTS (
+                    SELECT 1
+                    FROM \(GroupMember.self)
+                    WHERE (
+                        \(groupMember[.groupId]) = \(closedGroup[.threadId]) AND
+                        \(SQL("\(groupMember[.role]) != \(GroupMember.Role.zombie)")) AND
+                        \(SQL("\(groupMember[.profileId]) = \(userPublicKey)"))
+                    )
+                ) AS \(ViewModel.currentUserIsClosedGroupMemberKey),
+
+                EXISTS (
+                    SELECT 1
+                    FROM \(GroupMember.self)
+                    WHERE (
+                        \(groupMember[.groupId]) = \(closedGroup[.threadId]) AND
+                        \(SQL("\(groupMember[.role]) = \(GroupMember.Role.admin)")) AND
+                        \(SQL("\(groupMember[.profileId]) = \(userPublicKey)"))
+                    )
+                ) AS \(ViewModel.currentUserIsClosedGroupAdminKey),
+        
                 \(openGroup[.name]) AS \(ViewModel.openGroupNameKey),
                 \(openGroup[.server]) AS \(ViewModel.openGroupServerKey),
                 \(openGroup[.roomToken]) AS \(ViewModel.openGroupRoomTokenKey),
@@ -902,16 +917,6 @@ public extension SessionThreadViewModel {
             LEFT JOIN \(Profile.self) AS \(ViewModel.contactProfileKey) ON \(ViewModel.contactProfileKey).\(profileIdColumnLiteral) = \(thread[.id])
             LEFT JOIN \(OpenGroup.self) ON \(openGroup[.threadId]) = \(thread[.id])
             LEFT JOIN \(ClosedGroup.self) ON \(closedGroup[.threadId]) = \(thread[.id])
-            LEFT JOIN \(GroupMember.self) AS \(ViewModel.currentUserIsClosedGroupMemberKey) ON (
-                \(SQL("\(ViewModel.currentUserIsClosedGroupMemberKey).\(groupMemberRoleColumnLiteral) != \(GroupMember.Role.zombie)")) AND
-                \(ViewModel.currentUserIsClosedGroupMemberKey).\(groupMemberGroupIdColumnLiteral) = \(closedGroup[.threadId]) AND
-                \(SQL("\(ViewModel.currentUserIsClosedGroupMemberKey).\(groupMemberProfileIdColumnLiteral) = \(userPublicKey)"))
-            )
-            LEFT JOIN \(GroupMember.self) AS \(ViewModel.currentUserIsClosedGroupAdminKey) ON (
-                \(SQL("\(ViewModel.currentUserIsClosedGroupAdminKey).\(groupMemberRoleColumnLiteral) = \(GroupMember.Role.admin)")) AND
-                \(ViewModel.currentUserIsClosedGroupAdminKey).\(groupMemberGroupIdColumnLiteral) = \(closedGroup[.threadId]) AND
-                \(SQL("\(ViewModel.currentUserIsClosedGroupAdminKey).\(groupMemberProfileIdColumnLiteral) = \(userPublicKey)"))
-            )
         
             LEFT JOIN \(Profile.self) AS \(ViewModel.closedGroupProfileFrontKey) ON (
                 \(ViewModel.closedGroupProfileFrontKey).\(profileIdColumnLiteral) = (
@@ -919,8 +924,8 @@ public extension SessionThreadViewModel {
                     FROM \(GroupMember.self)
                     JOIN \(Profile.self) ON \(profile[.id]) = \(groupMember[.profileId])
                     WHERE (
-                        \(SQL("\(groupMember[.role]) = \(GroupMember.Role.standard)")) AND
                         \(groupMember[.groupId]) = \(closedGroup[.threadId]) AND
+                        \(SQL("\(groupMember[.role]) = \(GroupMember.Role.standard)")) AND
                         \(SQL("\(groupMember[.profileId]) != \(userPublicKey)"))
                     )
                 )
@@ -932,8 +937,8 @@ public extension SessionThreadViewModel {
                     FROM \(GroupMember.self)
                     JOIN \(Profile.self) ON \(profile[.id]) = \(groupMember[.profileId])
                     WHERE (
-                        \(SQL("\(groupMember[.role]) = \(GroupMember.Role.standard)")) AND
                         \(groupMember[.groupId]) = \(closedGroup[.threadId]) AND
+                        \(SQL("\(groupMember[.role]) = \(GroupMember.Role.standard)")) AND
                         \(SQL("\(groupMember[.profileId]) != \(userPublicKey)"))
                     )
                 )
diff --git a/SessionUIKit/Style Guide/Themes/Theme+ClassicDark.swift b/SessionUIKit/Style Guide/Themes/Theme+ClassicDark.swift
index 61ead815f..69242e54b 100644
--- a/SessionUIKit/Style Guide/Themes/Theme+ClassicDark.swift	
+++ b/SessionUIKit/Style Guide/Themes/Theme+ClassicDark.swift	
@@ -48,6 +48,9 @@ internal enum Theme_ClassicDark: ThemeColors {
         .radioButton_unselectedBackground: .clear,
         .radioButton_selectedBorder: .classicDark6,
         .radioButton_unselectedBorder: .classicDark6,
+        .radioButton_disabledSelectedBackground: .disabledDark,
+        .radioButton_disabledUnselectedBackground: .clear,
+        .radioButton_disabledBorder: .disabledDark,
         
         // SessionButton
         .sessionButton_text: .primary,
diff --git a/SessionUIKit/Style Guide/Themes/Theme+ClassicLight.swift b/SessionUIKit/Style Guide/Themes/Theme+ClassicLight.swift
index 645ec9631..f1e1a9d80 100644
--- a/SessionUIKit/Style Guide/Themes/Theme+ClassicLight.swift	
+++ b/SessionUIKit/Style Guide/Themes/Theme+ClassicLight.swift	
@@ -48,6 +48,9 @@ internal enum Theme_ClassicLight: ThemeColors {
         .radioButton_unselectedBackground: .clear,
         .radioButton_selectedBorder: .classicLight0,
         .radioButton_unselectedBorder: .classicLight0,
+        .radioButton_disabledSelectedBackground: .disabledLight,
+        .radioButton_disabledUnselectedBackground: .clear,
+        .radioButton_disabledBorder: .disabledLight,
         
         // OutlineButton
         .sessionButton_text: .classicLight0,
diff --git a/SessionUIKit/Style Guide/Themes/Theme+Colors.swift b/SessionUIKit/Style Guide/Themes/Theme+Colors.swift
index 057157bfd..625a96eb2 100644
--- a/SessionUIKit/Style Guide/Themes/Theme+Colors.swift	
+++ b/SessionUIKit/Style Guide/Themes/Theme+Colors.swift	
@@ -44,8 +44,8 @@ internal extension UIColor {
     static let warning: UIColor = #colorLiteral(red: 0.9882352941, green: 0.6941176471, blue: 0.3490196078, alpha: 1)            // #FCB159
     static let dangerDark: UIColor = #colorLiteral(red: 1, green: 0.2274509804, blue: 0.2274509804, alpha: 1)         // #FF3A3A
     static let dangerLight: UIColor = #colorLiteral(red: 0.8823529412, green: 0.1764705882, blue: 0.09803921569, alpha: 1)        // #E12D19
-    static let disabledDark: UIColor = #colorLiteral(red: 0.631372549, green: 0.6352941176, blue: 0.631372549, alpha: 1)       // #A1A2A1
-    static let disabledLight: UIColor = #colorLiteral(red: 0.4274509804, green: 0.4274509804, blue: 0.4274509804, alpha: 1)      // #6D6D6D
+    static let disabledDark: UIColor = #colorLiteral(red: 0.4274509804, green: 0.4274509804, blue: 0.4274509804, alpha: 1 )       // #6D6D6D
+    static let disabledLight: UIColor = #colorLiteral(red: 0.631372549, green: 0.6352941176, blue: 0.631372549, alpha: 1)      // #A1A2A1
     static let black_06: UIColor = #colorLiteral(red: 0, green: 0, blue: 0, alpha: 0.06)           // #000000
     
     static let pathConnected: UIColor = #colorLiteral(red: 0.1921568627, green: 0.9450980392, blue: 0.5882352941, alpha: 1)      // #31F196
diff --git a/SessionUIKit/Style Guide/Themes/Theme+OceanDark.swift b/SessionUIKit/Style Guide/Themes/Theme+OceanDark.swift
index 4b4b33efe..beb4cba54 100644
--- a/SessionUIKit/Style Guide/Themes/Theme+OceanDark.swift	
+++ b/SessionUIKit/Style Guide/Themes/Theme+OceanDark.swift	
@@ -48,6 +48,9 @@ internal enum Theme_OceanDark: ThemeColors {
         .radioButton_unselectedBackground: .clear,
         .radioButton_selectedBorder: .oceanDark7,
         .radioButton_unselectedBorder: .oceanDark7,
+        .radioButton_disabledSelectedBackground: .disabledDark,
+        .radioButton_disabledUnselectedBackground: .clear,
+        .radioButton_disabledBorder: .disabledDark,
         
         // SessionButton
         .sessionButton_text: .primary,
diff --git a/SessionUIKit/Style Guide/Themes/Theme+OceanLight.swift b/SessionUIKit/Style Guide/Themes/Theme+OceanLight.swift
index f752f21de..c1e72799e 100644
--- a/SessionUIKit/Style Guide/Themes/Theme+OceanLight.swift	
+++ b/SessionUIKit/Style Guide/Themes/Theme+OceanLight.swift	
@@ -48,6 +48,9 @@ internal enum Theme_OceanLight: ThemeColors {
         .radioButton_unselectedBackground: .clear,
         .radioButton_selectedBorder: .oceanLight1,
         .radioButton_unselectedBorder: .oceanLight3,
+        .radioButton_disabledSelectedBackground: .disabledLight,
+        .radioButton_disabledUnselectedBackground: .clear,
+        .radioButton_disabledBorder: .disabledLight,
         
         // SessionButton
         .sessionButton_text: .oceanLight1,
diff --git a/SessionUIKit/Style Guide/Themes/Theme.swift b/SessionUIKit/Style Guide/Themes/Theme.swift
index 57a5fb200..f2766cc6d 100644
--- a/SessionUIKit/Style Guide/Themes/Theme.swift	
+++ b/SessionUIKit/Style Guide/Themes/Theme.swift	
@@ -136,6 +136,9 @@ public indirect enum ThemeValue: Hashable {
     case radioButton_unselectedBackground
     case radioButton_selectedBorder
     case radioButton_unselectedBorder
+    case radioButton_disabledSelectedBackground
+    case radioButton_disabledUnselectedBackground
+    case radioButton_disabledBorder
     
     // SessionButton
     case sessionButton_text