diff --git a/src/com/android/settings/service/PreferenceServiceRequestTransformer.kt b/src/com/android/settings/service/PreferenceServiceRequestTransformer.kt
index b0f9d0d068e..39997838650 100644
--- a/src/com/android/settings/service/PreferenceServiceRequestTransformer.kt
+++ b/src/com/android/settings/service/PreferenceServiceRequestTransformer.kt
@@ -157,11 +157,10 @@ fun transformFrameworkSetValueRequest(request: SetValueRequest): PreferenceSette
         SettingsPreferenceValue.TYPE_INT -> preferenceValueProto {
             intValue = request.preferenceValue.intValue
         }
-        else -> null
-    }
-    return valueProto?.let {
-        PreferenceSetterRequest(request.screenKey, request.preferenceKey, it)
+        else -> return null
     }
+    // TODO: support parameterized screen
+    return PreferenceSetterRequest(request.screenKey, null, request.preferenceKey, valueProto)
 }
 
 /** Translate Catalyst SET VALUE result to Framework SET VALUE result */