diff --git a/frontend/src/metabase/components/FieldValuesWidget/FieldValuesWidget.tsx b/frontend/src/metabase/components/FieldValuesWidget/FieldValuesWidget.tsx
index 58ea61472841911750b58c52563662eda72008df..8b84f3dac6c289b52357291e6284815cb9b8630e 100644
--- a/frontend/src/metabase/components/FieldValuesWidget/FieldValuesWidget.tsx
+++ b/frontend/src/metabase/components/FieldValuesWidget/FieldValuesWidget.tsx
@@ -102,7 +102,6 @@ export interface IFieldValuesWidgetProps {
   className?: string;
   prefix?: string;
   placeholder?: string;
-  forceTokenField?: boolean;
   checkedColor?: string;
 
   valueRenderer?: (value: string | number) => JSX.Element;
@@ -135,7 +134,6 @@ export function FieldValuesWidgetInner({
   className,
   prefix,
   placeholder,
-  forceTokenField = false,
   checkedColor,
   valueRenderer,
   optionRenderer,
@@ -411,8 +409,7 @@ export function FieldValuesWidgetInner({
   const isListMode =
     !disableList &&
     shouldList({ parameter, fields, disableSearch }) &&
-    valuesMode === "list" &&
-    !forceTokenField;
+    valuesMode === "list";
   const isLoading = loadingState === "LOADING";
   const hasListValues = hasList({
     parameter,
diff --git a/frontend/src/metabase/components/FormCategoryInput/CategoryFieldInput/CategoryFieldInput.tsx b/frontend/src/metabase/components/FormCategoryInput/CategoryFieldInput/CategoryFieldInput.tsx
index 087ac2cb049c732562ce3555c7437f94a0e1d0bf..19aed512dc35069051c16f8ecc3e5d8587c8a405 100644
--- a/frontend/src/metabase/components/FormCategoryInput/CategoryFieldInput/CategoryFieldInput.tsx
+++ b/frontend/src/metabase/components/FormCategoryInput/CategoryFieldInput/CategoryFieldInput.tsx
@@ -51,7 +51,7 @@ function CategoryFieldInput({
         autoFocus={false}
         alwaysShowOptions={false}
         disableSearch={false}
-        forceTokenField
+        disableList
         layoutRenderer={DefaultTokenFieldLayout}
         valueRenderer={(val: string) => <span>{val}</span>}
         color="brand"