diff --git a/apps/portal/src/components/shared/CitiesTypeahead.tsx b/apps/portal/src/components/shared/CitiesTypeahead.tsx
index 902759b0..f9a6140d 100644
--- a/apps/portal/src/components/shared/CitiesTypeahead.tsx
+++ b/apps/portal/src/components/shared/CitiesTypeahead.tsx
@@ -41,6 +41,7 @@ export default function CitiesTypeahead({
   return (
     <Typeahead
       label={label}
+      minQueryLength={3}
       noResultsMessage="No cities found"
       nullable={true}
       options={
diff --git a/apps/portal/src/components/shared/CountriesTypeahead.tsx b/apps/portal/src/components/shared/CountriesTypeahead.tsx
index 51d72cb0..a1ef875f 100644
--- a/apps/portal/src/components/shared/CountriesTypeahead.tsx
+++ b/apps/portal/src/components/shared/CountriesTypeahead.tsx
@@ -39,6 +39,7 @@ export default function CountriesTypeahead({
   return (
     <Typeahead
       label="Country"
+      minQueryLength={3}
       noResultsMessage="No countries found"
       nullable={true}
       options={
diff --git a/packages/ui/src/Typeahead/Typeahead.tsx b/packages/ui/src/Typeahead/Typeahead.tsx
index 903f69b9..b2967f6d 100644
--- a/packages/ui/src/Typeahead/Typeahead.tsx
+++ b/packages/ui/src/Typeahead/Typeahead.tsx
@@ -28,6 +28,8 @@ type Props = Readonly<{
   errorMessage?: React.ReactNode;
   isLabelHidden?: boolean;
   label: string;
+  // Minimum query length before any results will be shown.
+  minQueryLength?: number;
   noResultsMessage?: string;
   onQueryChange: (
     value: string,
@@ -80,6 +82,7 @@ export default function Typeahead({
   errorMessage,
   isLabelHidden,
   label,
+  minQueryLength = 0,
   noResultsMessage = 'No results',
   nullable = false,
   options,
@@ -167,46 +170,48 @@ export default function Typeahead({
               />
             </Combobox.Button>
           </div>
-          <Transition
-            afterLeave={() => setQuery('')}
-            as={Fragment}
-            leave="transition ease-in duration-100"
-            leaveFrom="opacity-100"
-            leaveTo="opacity-0">
-            <Combobox.Options
-              className={clsx(
-                'absolute z-10 mt-1 max-h-60 w-full overflow-auto rounded-md bg-white py-1 shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none',
-                textSizes[textSize],
-              )}>
-              {options.length === 0 && query !== '' ? (
-                <div className="relative cursor-default select-none py-2 px-4 text-slate-700">
-                  {noResultsMessage}
-                </div>
-              ) : (
-                options.map((option) => (
-                  <Combobox.Option
-                    key={option.id}
-                    className={({ active }) =>
-                      clsx(
-                        'relative cursor-default select-none py-2 px-4 text-slate-500',
-                        active && 'bg-slate-100',
-                      )
-                    }
-                    value={option}>
-                    {({ selected }) => (
-                      <span
-                        className={clsx(
-                          'block truncate',
-                          selected ? 'font-medium' : 'font-normal',
-                        )}>
-                        {option.label}
-                      </span>
-                    )}
-                  </Combobox.Option>
-                ))
-              )}
-            </Combobox.Options>
-          </Transition>
+          {query.length >= minQueryLength && (
+            <Transition
+              afterLeave={() => setQuery('')}
+              as={Fragment}
+              leave="transition ease-in duration-100"
+              leaveFrom="opacity-100"
+              leaveTo="opacity-0">
+              <Combobox.Options
+                className={clsx(
+                  'absolute z-10 mt-1 max-h-60 w-full overflow-auto rounded-md bg-white py-1 shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none',
+                  textSizes[textSize],
+                )}>
+                {options.length === 0 && query !== '' ? (
+                  <div className="relative cursor-default select-none py-2 px-4 text-slate-700">
+                    {noResultsMessage}
+                  </div>
+                ) : (
+                  options.map((option) => (
+                    <Combobox.Option
+                      key={option.id}
+                      className={({ active }) =>
+                        clsx(
+                          'relative cursor-default select-none py-2 px-4 text-slate-500',
+                          active && 'bg-slate-100',
+                        )
+                      }
+                      value={option}>
+                      {({ selected }) => (
+                        <span
+                          className={clsx(
+                            'block truncate',
+                            selected ? 'font-medium' : 'font-normal',
+                          )}>
+                          {option.label}
+                        </span>
+                      )}
+                    </Combobox.Option>
+                  ))
+                )}
+              </Combobox.Options>
+            </Transition>
+          )}
         </div>
       </Combobox>
       {errorMessage && (