diff --git a/packages/LineagePreferenceLib/java/lineageos/preference/SelfRemovingSwitchPreference.java b/packages/LineagePreferenceLib/java/lineageos/preference/SelfRemovingSwitchPreference.java
index 4666b62a..4071825b 100644
--- a/packages/LineagePreferenceLib/java/lineageos/preference/SelfRemovingSwitchPreference.java
+++ b/packages/LineagePreferenceLib/java/lineageos/preference/SelfRemovingSwitchPreference.java
@@ -66,10 +66,8 @@ public abstract class SelfRemovingSwitchPreference extends SwitchPreferenceCompa
     protected void onSetInitialValue(boolean restorePersistedValue, Object defaultValue) {
         final boolean checked;
         if (!restorePersistedValue || !isPersisted()) {
-            if (defaultValue == null) {
-                return;
-            }
-            checked = getBoolean(getKey(), (boolean) defaultValue);
+            boolean defValue = defaultValue == null ? false : (boolean) defaultValue;
+            checked = getBoolean(getKey(), defValue);
             if (shouldPersist()) {
                 persistBoolean(checked);
             }