diff --git a/Sources/MusicAssistantApp/Presentation/MusicalParametersEditorView.swift b/Sources/MusicAssistantApp/Presentation/MusicalParametersEditorView.swift
index 0dec298..11c2ed4 100644
--- a/Sources/MusicAssistantApp/Presentation/MusicalParametersEditorView.swift
+++ b/Sources/MusicAssistantApp/Presentation/MusicalParametersEditorView.swift
@@ -67,10 +67,10 @@ private struct ManualAutoIntegerRow: View {
         Binding {
             value.mode
         } set: { newMode in
-            value.mode = newMode
-            if newMode == .auto {
-                value.value = nil
-            }
+            value = ManualAutoValue(
+                mode: newMode,
+                value: newMode == .manual ? value.value : nil
+            )
         }
     }
 
@@ -102,10 +102,10 @@ private struct ManualAutoTextRow: View {
         Binding {
             value.mode
         } set: { newMode in
-            value.mode = newMode
-            if newMode == .auto {
-                value.value = nil
-            }
+            value = ManualAutoValue(
+                mode: newMode,
+                value: newMode == .manual ? value.value : nil
+            )
         }
     }