diff --git a/packages/client/src/formElements/FilterInput.tsx b/packages/client/src/formElements/FilterInput.tsx
index a70367f7..3f2ed8c0 100644
--- a/packages/client/src/formElements/FilterInput.tsx
+++ b/packages/client/src/formElements/FilterInput.tsx
@@ -197,7 +197,6 @@ const FilterInput: FormElementComponent<FilterInputProps, FilterInputValue> = (
                     }}
                   />
                 )}
-                )
               </>
             )}
           </div>
diff --git a/packages/client/src/formElements/FilterInputContext.tsx b/packages/client/src/formElements/FilterInputContext.tsx
index c701121d..65974525 100644
--- a/packages/client/src/formElements/FilterInputContext.tsx
+++ b/packages/client/src/formElements/FilterInputContext.tsx
@@ -164,7 +164,7 @@ export function FilterInputServiceContextProvider({
             updatingCount: false,
             count: prev.fullCellCount,
           }));
-        } else if (serviceLocation) {
+        } else if (serviceLocation && state.fullCellCount === 0) {
           // TODO: update count from service
           setState((prev) => ({
             ...prev,