diff --git a/libs/data-access/admin-api/src/api.ts b/libs/data-access/admin-api/src/api.ts
index 2b285438..7242cab8 100644
--- a/libs/data-access/admin-api/src/api.ts
+++ b/libs/data-access/admin-api/src/api.ts
@@ -1,4 +1,5 @@
 import adminSpec from './lib/api/output.json';
 
 export type * from './lib/api';
+export type * from './lib/api/type';
 export const spec = adminSpec;
diff --git a/libs/features/query/src/lib/convertInvocation.ts b/libs/features/query/src/lib/convertInvocation.ts
index 16b94f97..5f88ea9d 100644
--- a/libs/features/query/src/lib/convertInvocation.ts
+++ b/libs/features/query/src/lib/convertInvocation.ts
@@ -1,4 +1,4 @@
-import type { RawInvocation } from '@restate/data-access/admin-api';
+import type { RawInvocation } from '@restate/data-access/admin-api/spec';
 import { getComputedInvocationStatus } from './getComputedInvocationStatus';
 import { convertToUTC } from './convertToUTC';
 
diff --git a/libs/features/query/src/lib/convertJournal.ts b/libs/features/query/src/lib/convertJournal.ts
index 0df412fe..e8874ce9 100644
--- a/libs/features/query/src/lib/convertJournal.ts
+++ b/libs/features/query/src/lib/convertJournal.ts
@@ -23,7 +23,7 @@ import type {
   RunJournalEntryType,
   SetStateJournalEntryType,
   SleepJournalEntryType,
-} from '@restate/data-access/admin-api';
+} from '@restate/data-access/admin-api/spec';
 import { convertToUTC } from './convertToUTC';
 import {
   awakeable,
diff --git a/libs/features/query/src/lib/getComputedInvocationStatus.ts b/libs/features/query/src/lib/getComputedInvocationStatus.ts
index a5414e43..7e4704e7 100644
--- a/libs/features/query/src/lib/getComputedInvocationStatus.ts
+++ b/libs/features/query/src/lib/getComputedInvocationStatus.ts
@@ -1,7 +1,7 @@
 import type {
   InvocationComputedStatus,
   RawInvocation,
-} from '@restate/data-access/admin-api';
+} from '@restate/data-access/admin-api/spec';
 
 export function getComputedInvocationStatus(
   invocation: RawInvocation
diff --git a/libs/features/query/src/lib/query.ts b/libs/features/query/src/lib/query.ts
index 0971cc6f..147e7a93 100644
--- a/libs/features/query/src/lib/query.ts
+++ b/libs/features/query/src/lib/query.ts
@@ -276,4 +276,6 @@ export function query(req: Request) {
       headers
     );
   }
+
+  return Promise.resolve(Response.json({}));
 }
diff --git a/libs/features/query/tsconfig.json b/libs/features/query/tsconfig.json
index 17405834..4a63022e 100644
--- a/libs/features/query/tsconfig.json
+++ b/libs/features/query/tsconfig.json
@@ -5,7 +5,8 @@
     "noImplicitOverride": true,
     "noImplicitReturns": true,
     "noFallthroughCasesInSwitch": true,
-    "noPropertyAccessFromIndexSignature": true
+    "noPropertyAccessFromIndexSignature": true,
+    "esModuleInterop": true
   },
   "files": [],
   "include": [],
diff --git a/tsconfig.base.json b/tsconfig.base.json
index 98dbe52c..90829d01 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -42,7 +42,6 @@
       "@restate/features/overview-route": [
         "libs/features/overview-route/src/index.ts"
       ],
-      "@restate/features/query": ["libs/features/query/src/index.ts"],
       "@restate/features/restate-context": [
         "libs/features/restate-context/src/index.ts"
       ],