diff --git a/apps/web/src/app/App.tsx b/apps/web/src/app/App.tsx
index dfa03165b2a92ddd650cb1ea2ed34f1b482ef7fd..7138326df541ac0f2bfb62826d25b62bf1551c07 100644
--- a/apps/web/src/app/App.tsx
+++ b/apps/web/src/app/App.tsx
@@ -9,7 +9,7 @@ import {
 } from '@graphpolaris/shared/lib/data-access';
 import { addError, setCurrentTheme } from '@graphpolaris/shared/lib/data-access/store/configSlice';
 import { resetGraphQueryResults, queryingBackend } from '@graphpolaris/shared/lib/data-access/store/graphQueryResultSlice';
-import { Query2BackendQuery, QueryMultiGraph } from '@graphpolaris/shared/lib/querybuilder';
+import { QueryMultiGraph } from '@graphpolaris/shared/lib/querybuilder';
 import { Navbar } from '../components/navbar/navbar';
 import { FrozenOverlay, Resizable } from '@graphpolaris/shared/lib/components/layout';
 import { DashboardAlerts } from '@graphpolaris/shared/lib/data-access/security/dashboardAlerts';
@@ -36,7 +36,6 @@ export function App(props: App) {
   const ml = useML();
   const session = useSessionCache();
   const dispatch = useAppDispatch();
-  const queryBuilderSettings = useQuerybuilderSettings();
   const [monitoringOpen, setMonitoringOpen] = useState<boolean>(false);
 
   const runQuery = () => {
@@ -45,7 +44,7 @@ export function App(props: App) {
         dispatch(resetGraphQueryResults());
       } else {
         dispatch(queryingBackend());
-        wsQueryRequest(Query2BackendQuery(session.currentSaveState, query, queryBuilderSettings, ml, queryBuilderSettings.unionTypes));
+        wsQueryRequest(ml);
       }
     }
   };
diff --git a/libs/shared/lib/data-access/broker/wsQuery.ts b/libs/shared/lib/data-access/broker/wsQuery.ts
index 6f8bc2c3a4b9e6775cd9d75cf134230a60e251e0..c5e6ba7e35d0bf15c6ac2ff8c7d0e08eacc92b13 100644
--- a/libs/shared/lib/data-access/broker/wsQuery.ts
+++ b/libs/shared/lib/data-access/broker/wsQuery.ts
@@ -4,13 +4,25 @@ import { BackendQueryFormat } from '../../querybuilder';
 import { Broker } from './broker';
 import { QueryBuilderText } from '../store/querybuilderSlice';
 import { GraphQueryResultFromBackendPayload } from '../store/graphQueryResultSlice';
+import { ML, MLTypes } from '../store/mlSlice';
 
-export function wsQueryRequest(query: BackendQueryFormat) {
-  if (query.cached === undefined) query.cached = false;
+export function wsQueryRequest(ml: ML) {
+  const mlEnabled = Object.entries(ml)
+    .filter(([_,value]) => value.enabled)
+    .map(([key,_]) => {
+      return {
+        type: key as MLTypes,
+        //parameters: []
+      }
+    })
   Broker.instance().sendMessage({
     key: 'query',
     subKey: 'get',
-    body: query,
+    body: { 
+      queryID: "0", // TODO: not used yet, but used when multiple queries per save state are supported
+      ml: mlEnabled,
+      cached: false
+     }, 
   });
 }