diff --git a/Session/Conversations/Settings/ThreadDisappearingMessagesViewModel.swift b/Session/Conversations/Settings/ThreadDisappearingMessagesViewModel.swift
index b13a890a2..5783014c1 100644
--- a/Session/Conversations/Settings/ThreadDisappearingMessagesViewModel.swift
+++ b/Session/Conversations/Settings/ThreadDisappearingMessagesViewModel.swift
@@ -206,6 +206,7 @@ class ThreadDisappearingMessagesViewModel: SessionTableViewModel<ThreadDisappear
                                         rightAccessory: .radio(
                                             isSelected: { (self?.currentSelection.value.isEnabled == false) }
                                         ),
+                                        isEnabled: false,
                                         onTap: {
                                             let updatedConfig: DisappearingMessagesConfiguration = currentSelection
                                                 .with(
@@ -230,6 +231,7 @@ class ThreadDisappearingMessagesViewModel: SessionTableViewModel<ThreadDisappear
                                                 rightAccessory: .radio(
                                                     isSelected: { (self?.currentSelection.value.isEnabled == true) && (self?.currentSelection.value.durationSeconds == duration) }
                                                 ),
+                                                isEnabled: false,
                                                 onTap: {
                                                     let updatedConfig: DisappearingMessagesConfiguration = currentSelection
                                                         .with(
diff --git a/Session/Shared/Views/SessionCell+AccessoryView.swift b/Session/Shared/Views/SessionCell+AccessoryView.swift
index c904af354..acb4c4d8c 100644
--- a/Session/Shared/Views/SessionCell+AccessoryView.swift
+++ b/Session/Shared/Views/SessionCell+AccessoryView.swift
@@ -296,18 +296,29 @@ extension SessionCell {
                     let wasOldSelection: Bool = (!isSelected && storedSelection)
                     
                     radioBorderView.isHidden = false
-                    radioBorderView.themeBorderColor = (isSelected ?
-                        .radioButton_selectedBorder :
-                        .radioButton_unselectedBorder
-                    )
+                    if isEnabled {
+                        radioBorderView.themeBorderColor = (isSelected ?
+                            .radioButton_selectedBorder :
+                            .radioButton_unselectedBorder
+                        )
+                    } else {
+                        radioBorderView.themeBorderColor = .radioButton_border_disabled
+                    }
                     radioBorderView.layer.cornerRadius = (size.borderSize / 2)
                     
                     radioView.alpha = (wasOldSelection ? 0.3 : 1)
                     radioView.isHidden = (!isSelected && !storedSelection)
-                    radioView.themeBackgroundColor = (isSelected || wasOldSelection ?
-                        .radioButton_selectedBackground :
-                        .radioButton_unselectedBackground
-                    )
+                    if isEnabled {
+                        radioView.themeBackgroundColor = (isSelected || wasOldSelection ?
+                            .radioButton_selectedBackground :
+                            .radioButton_unselectedBackground
+                        )
+                    } else {
+                        radioView.themeBackgroundColor = (isSelected || wasOldSelection ?
+                            .radioButton_selectedBackground_disabled :
+                            .radioButton_unselectedBackground
+                        )
+                    }
                     radioView.layer.cornerRadius = (size.selectionSize / 2)
                     
                     radioViewWidthConstraint.constant = size.selectionSize
diff --git a/SessionUIKit/Style Guide/Themes/Theme+ClassicDark.swift b/SessionUIKit/Style Guide/Themes/Theme+ClassicDark.swift
index 61ed9914e..6c5d68697 100644
--- a/SessionUIKit/Style Guide/Themes/Theme+ClassicDark.swift	
+++ b/SessionUIKit/Style Guide/Themes/Theme+ClassicDark.swift	
@@ -43,9 +43,11 @@ internal enum Theme_ClassicDark: ThemeColors {
         
         // RadioButton
         .radioButton_selectedBackground: .primary,
+        .radioButton_selectedBackground_disabled: .disabledDark,
         .radioButton_unselectedBackground: .clear,
         .radioButton_selectedBorder: .classicDark6,
         .radioButton_unselectedBorder: .classicDark6,
+        .radioButton_border_disabled: .disabledDark,
         
         // SessionButton
         .sessionButton_text: .primary,
diff --git a/SessionUIKit/Style Guide/Themes/Theme+ClassicLight.swift b/SessionUIKit/Style Guide/Themes/Theme+ClassicLight.swift
index d2554fc0d..cc534d34f 100644
--- a/SessionUIKit/Style Guide/Themes/Theme+ClassicLight.swift	
+++ b/SessionUIKit/Style Guide/Themes/Theme+ClassicLight.swift	
@@ -43,9 +43,11 @@ internal enum Theme_ClassicLight: ThemeColors {
         
         // RadioButton
         .radioButton_selectedBackground: .primary,
+        .radioButton_selectedBackground_disabled: .disabledLight,
         .radioButton_unselectedBackground: .clear,
         .radioButton_selectedBorder: .classicLight0,
         .radioButton_unselectedBorder: .classicLight0,
+        .radioButton_border_disabled: .disabledLight,
         
         // OutlineButton
         .sessionButton_text: .classicLight0,
diff --git a/SessionUIKit/Style Guide/Themes/Theme+OceanDark.swift b/SessionUIKit/Style Guide/Themes/Theme+OceanDark.swift
index 1775bfed0..bfcb6e64e 100644
--- a/SessionUIKit/Style Guide/Themes/Theme+OceanDark.swift	
+++ b/SessionUIKit/Style Guide/Themes/Theme+OceanDark.swift	
@@ -43,9 +43,11 @@ internal enum Theme_OceanDark: ThemeColors {
         
         // RadioButton
         .radioButton_selectedBackground: .primary,
+        .radioButton_selectedBackground_disabled: .disabledDark,
         .radioButton_unselectedBackground: .clear,
         .radioButton_selectedBorder: .oceanDark7,
         .radioButton_unselectedBorder: .oceanDark7,
+        .radioButton_border_disabled: .disabledDark,
         
         // SessionButton
         .sessionButton_text: .primary,
diff --git a/SessionUIKit/Style Guide/Themes/Theme+OceanLight.swift b/SessionUIKit/Style Guide/Themes/Theme+OceanLight.swift
index c22f4fb34..af96ba6d2 100644
--- a/SessionUIKit/Style Guide/Themes/Theme+OceanLight.swift	
+++ b/SessionUIKit/Style Guide/Themes/Theme+OceanLight.swift	
@@ -43,9 +43,11 @@ internal enum Theme_OceanLight: ThemeColors {
         
         // RadioButton
         .radioButton_selectedBackground: .primary,
+        .radioButton_selectedBackground_disabled: .disabledLight,
         .radioButton_unselectedBackground: .clear,
         .radioButton_selectedBorder: .oceanLight1,
         .radioButton_unselectedBorder: .oceanLight3,
+        .radioButton_border_disabled: .disabledLight,
         
         // SessionButton
         .sessionButton_text: .oceanLight1,
diff --git a/SessionUIKit/Style Guide/Themes/Theme.swift b/SessionUIKit/Style Guide/Themes/Theme.swift
index d81a5a3bf..8e117dcef 100644
--- a/SessionUIKit/Style Guide/Themes/Theme.swift	
+++ b/SessionUIKit/Style Guide/Themes/Theme.swift	
@@ -131,9 +131,11 @@ public indirect enum ThemeValue: Hashable {
     
     // RadioButton
     case radioButton_selectedBackground
+    case radioButton_selectedBackground_disabled
     case radioButton_unselectedBackground
     case radioButton_selectedBorder
     case radioButton_unselectedBorder
+    case radioButton_border_disabled
     
     // SessionButton
     case sessionButton_text