diff --git a/packages/services/api/src/modules/lab/resolvers.ts b/packages/services/api/src/modules/lab/resolvers.ts
index 4716400a1..a07093307 100644
--- a/packages/services/api/src/modules/lab/resolvers.ts
+++ b/packages/services/api/src/modules/lab/resolvers.ts
@@ -36,6 +36,15 @@ export const resolvers: LabModule.Resolvers = {
         return null;
       }
 
+      if (latestSchema.compositeSchemaSDL) {
+        return {
+          schema: latestSchema.compositeSchemaSDL,
+          mocks: {},
+        };
+      }
+
+      // Legacy Fallback
+
       const [
         schemas,
         { type, externalComposition, nativeFederation, legacyRegistryModel },
diff --git a/packages/services/api/src/modules/schema/resolvers.ts b/packages/services/api/src/modules/schema/resolvers.ts
index 5c530724b..1c20cbf05 100644
--- a/packages/services/api/src/modules/schema/resolvers.ts
+++ b/packages/services/api/src/modules/schema/resolvers.ts
@@ -935,6 +935,12 @@ export const resolvers: SchemaModule.Resolvers = {
         .then(r => r.supergraph);
     },
     async sdl(version, _, { injector }) {
+      if (version.compositeSchemaSDL) {
+        return version.compositeSchemaSDL;
+      }
+
+      // Legacy Fallback
+
       const [project, organization] = await Promise.all([
         injector.get(ProjectManager).getProject({
           organization: version.organization,