diff --git a/Loop/Views/GlucoseBasedApplicationFactorSelectionView.swift b/Loop/Views/GlucoseBasedApplicationFactorSelectionView.swift
index 09a68d58c1..0d88e65dfa 100644
--- a/Loop/Views/GlucoseBasedApplicationFactorSelectionView.swift
+++ b/Loop/Views/GlucoseBasedApplicationFactorSelectionView.swift
@@ -44,9 +44,6 @@ public struct GlucoseBasedApplicationFactorSelectionView: View {
                 }
             }
             .padding()
-            .onChange(of: isGlucoseBasedApplicationFactorEnabled) { newValue in
-                UserDefaults.standard.glucoseBasedApplicationFactorEnabled = newValue
-            }
         }
         .navigationBarTitleDisplayMode(.inline)
     }
diff --git a/Loop/Views/IntegralRetrospectiveCorrectionSelectionView.swift b/Loop/Views/IntegralRetrospectiveCorrectionSelectionView.swift
index 9af84adf4f..8556e4fed6 100644
--- a/Loop/Views/IntegralRetrospectiveCorrectionSelectionView.swift
+++ b/Loop/Views/IntegralRetrospectiveCorrectionSelectionView.swift
@@ -27,9 +27,6 @@ public struct IntegralRetrospectiveCorrectionSelectionView: View {
                 Divider()
 
                 Toggle(NSLocalizedString("Enable Integral Retrospective Correction", comment: "Title for Integral Retrospective Correction toggle"), isOn: $isIntegralRetrospectiveCorrectionEnabled)
-                    .onChange(of: isIntegralRetrospectiveCorrectionEnabled) { newValue in
-                        UserDefaults.standard.integralRetrospectiveCorrectionEnabled = newValue
-                    }
                     .padding(.top, 20)
             }
             .padding()
diff --git a/Loop/Views/SettingsView+algorithmExperimentsSection.swift b/Loop/Views/SettingsView+algorithmExperimentsSection.swift
index 54bd2c71a0..795fbdd860 100644
--- a/Loop/Views/SettingsView+algorithmExperimentsSection.swift
+++ b/Loop/Views/SettingsView+algorithmExperimentsSection.swift
@@ -39,8 +39,8 @@ public struct ExperimentRow: View {
 }
 
 public struct ExperimentsSettingsView: View {
-    @State private var isGlucoseBasedApplicationFactorEnabled = UserDefaults.standard.glucoseBasedApplicationFactorEnabled
-    @State private var isIntegralRetrospectiveCorrectionEnabled = UserDefaults.standard.integralRetrospectiveCorrectionEnabled
+    @AppStorage(UserDefaults.Key.GlucoseBasedApplicationFactorEnabled.rawValue) private var isGlucoseBasedApplicationFactorEnabled = false
+    @AppStorage(UserDefaults.Key.IntegralRetrospectiveCorrectionEnabled.rawValue) private var isIntegralRetrospectiveCorrectionEnabled = false
     var automaticDosingStrategy: AutomaticDosingStrategy
 
     public var body: some View {
@@ -80,7 +80,7 @@ public struct ExperimentsSettingsView: View {
 
 
 extension UserDefaults {
-    private enum Key: String {
+    fileprivate enum Key: String {
         case GlucoseBasedApplicationFactorEnabled = "com.loopkit.algorithmExperiments.glucoseBasedApplicationFactorEnabled"
         case IntegralRetrospectiveCorrectionEnabled = "com.loopkit.algorithmExperiments.integralRetrospectiveCorrectionEnabled"
     }