diff --git a/src/modules/transport-mode/filter/__tests__/filter.test.tsx b/src/modules/transport-mode/filter/__tests__/filter.test.tsx
index 35d83609..894102d7 100644
--- a/src/modules/transport-mode/filter/__tests__/filter.test.tsx
+++ b/src/modules/transport-mode/filter/__tests__/filter.test.tsx
@@ -122,7 +122,15 @@ describe('transport mode filter', () => {
 
     const initial: string[] = [];
 
-    const expected = null;
+    const expected = [
+      'bus',
+      'rail',
+      'expressboat',
+      'ferry',
+      'airportbus',
+      'air',
+      'other',
+    ];
 
     render(
       <TransportModeFilter
diff --git a/src/modules/transport-mode/filter/filter.tsx b/src/modules/transport-mode/filter/filter.tsx
index 74a6c8f8..d2b40e90 100644
--- a/src/modules/transport-mode/filter/filter.tsx
+++ b/src/modules/transport-mode/filter/filter.tsx
@@ -51,7 +51,9 @@ export default function TransportModeFilter({
               !localFilterState || localFilterState.length === data.length
             }
             onChange={(event) => {
-              onChangeWrapper(event.target.checked ? null : []);
+              onChangeWrapper(
+                event.target.checked ? data?.map((option) => option.id) : [],
+              );
             }}
           />
 
diff --git a/src/page-modules/assistant/layout.tsx b/src/page-modules/assistant/layout.tsx
index 973a4e87..0dd850d5 100644
--- a/src/page-modules/assistant/layout.tsx
+++ b/src/page-modules/assistant/layout.tsx
@@ -59,15 +59,6 @@ function AssistantLayout({ children, tripQuery }: AssistantLayoutProps) {
     getTransportModeFilter,
   );
 
-  useEffect(() => {
-    if (tripQuery.transportModeFilter === null)
-      onTransportFilterChanged(
-        transportModeFilter
-          ?.filter((filter) => filter.id !== 'air')
-          .map((filter) => filter.id) ?? null,
-      );
-  }, [transportModeFilter]);
-
   const setValuesWithLoading = async (
     override: Partial<FromToTripQuery>,
     replace = false,
@@ -131,8 +122,23 @@ function AssistantLayout({ children, tripQuery }: AssistantLayoutProps) {
   const { urls, orgId } = getOrgData();
   const { isDarkMode } = useTheme();
 
+  /*
+   * Temporary solution until firebase configuration is in place.
+   */
+  useEffect(() => {
+    if (tripQuery.transportModeFilter === null)
+      onTransportFilterChanged(
+        transportModeFilter
+          ?.filter(
+            (filter) =>
+              !filter.modes.some((mode) => mode.transportMode === 'air'),
+          )
+          .map((filter) => filter.id) ?? null,
+      );
+  }, [transportModeFilter]);
+
   /**
-   * Temprorary solution to disable line filter for some orgs until
+   * Temporary solution to disable line filter for some orgs until
    * we have a working solution for all orgs.
    */
   const disableLineFilter =