diff --git a/packages/frontend/src/app/configure/page.tsx b/packages/frontend/src/app/configure/page.tsx
index 0b910dc2..13c2cd1f 100644
--- a/packages/frontend/src/app/configure/page.tsx
+++ b/packages/frontend/src/app/configure/page.tsx
@@ -1164,7 +1164,9 @@ export default function Configure() {
                         })) || []
                       }
                       setValues={(selectedAddons) => {
-                        setMediaFlowProxiedAddons(selectedAddons);
+                        setMediaFlowProxiedAddons(
+                          selectedAddons.length === 0 ? null : selectedAddons
+                        );
                       }}
                       values={mediaFlowProxiedAddons || undefined}
                     />
@@ -1192,7 +1194,11 @@ export default function Configure() {
                         })),
                       ]}
                       setValues={(selectedServices) => {
-                        setMediaFlowProxiedServices(selectedServices);
+                        setMediaFlowProxiedServices(
+                          selectedServices.length === 0
+                            ? null
+                            : selectedServices
+                        );
                       }}
                       values={mediaFlowProxiedServices || undefined}
                     />