diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsAdapter.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsAdapter.kt
index 3882af86cc..48122bdfab 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsAdapter.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsAdapter.kt
@@ -212,22 +212,21 @@ class SwitchPreferenceViewHolder(itemView: View) : PreferenceViewHolder<SwitchPr
     switchWidget.setOnCheckedChangeListener(null)
 
     switchWidget.isChecked = model.isChecked
+    switchWidget.isEnabled = model.isEnabled
 
     switchWidget.setOnCheckedChangeListener { _, _ ->
       model.onClick()
     }
 
+    itemView.setOnClickListener {
+      model.onClick()
+    }
+
     if (payload.contains(SwitchPreference.PAYLOAD_CHECKED)) {
       return
     }
 
     super.bind(model)
-
-    switchWidget.isEnabled = model.isEnabled
-
-    itemView.setOnClickListener {
-      model.onClick()
-    }
   }
 }