diff --git a/packages/form/src/BaseForm/BaseForm.tsx b/packages/form/src/BaseForm/BaseForm.tsx index b84c1ab13bab..03c0fd83cc43 100644 --- a/packages/form/src/BaseForm/BaseForm.tsx +++ b/packages/form/src/BaseForm/BaseForm.tsx @@ -644,20 +644,18 @@ function BaseForm, U = Record>( setUrlParamsMergeInitialValues({}); }, [syncToInitialValues]); + const getGenParams = useRefFunction(() => { + return { + ...urlSearch, + ...extraUrlParams, + }; + }); + useEffect(() => { if (!syncToUrl) return; - setUrlSearch( - genParams( - syncToUrl, - { - ...urlSearch, - ...extraUrlParams, - }, - 'set', - ), - ); + setUrlSearch(genParams(syncToUrl, getGenParams(), 'set')); // eslint-disable-next-line react-hooks/exhaustive-deps - }, [extraUrlParams, syncToUrl]); + }, [extraUrlParams, getGenParams, syncToUrl]); const getPopupContainer = useMemo(() => { if (typeof window === 'undefined') return undefined;