diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActionBarView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActionBarView.kt
index b0bac93b55..4bd0659112 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActionBarView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActionBarView.kt
@@ -137,8 +137,12 @@ class ConversationActionBarView : LinearLayout {
         }
 
         class SettingsDiffer: DiffUtil.ItemCallback<ConversationSetting>() {
-            override fun areItemsTheSame(oldItem: ConversationSetting, newItem: ConversationSetting) = oldItem === newItem
-            override fun areContentsTheSame(oldItem: ConversationSetting, newItem: ConversationSetting) = oldItem == newItem
+            override fun areItemsTheSame(oldItem: ConversationSetting, newItem: ConversationSetting): Boolean {
+                return oldItem.settingType === newItem.settingType
+            }
+            override fun areContentsTheSame(oldItem: ConversationSetting, newItem: ConversationSetting): Boolean {
+                return oldItem == newItem
+            }
         }
 
     }