diff --git a/packages/core/utils/src/dml/helpers/create-graphql.ts b/packages/core/utils/src/dml/helpers/create-graphql.ts
index 0894c413a7..264bf33518 100644
--- a/packages/core/utils/src/dml/helpers/create-graphql.ts
+++ b/packages/core/utils/src/dml/helpers/create-graphql.ts
@@ -82,11 +82,14 @@ export const toGraphQLSchema = <T extends any[]>(entities: T): string => {
     return entity
   })
 
-  const defaultMedusaSchema = `
+  const defaultMedusaSchema =
+    gqlSchemas.length > 0
+      ? `
     scalar DateTime
     scalar JSON
     directive @enumValue(value: String) on ENUM_VALUE
   `
+      : ""
 
   return defaultMedusaSchema + gqlSchemas.join("\n")
 }
diff --git a/packages/core/utils/src/modules-sdk/__tests__/joiner-config-builder.spec.ts b/packages/core/utils/src/modules-sdk/__tests__/joiner-config-builder.spec.ts
index 8c78424a2a..ed0f50c1f3 100644
--- a/packages/core/utils/src/modules-sdk/__tests__/joiner-config-builder.spec.ts
+++ b/packages/core/utils/src/modules-sdk/__tests__/joiner-config-builder.spec.ts
@@ -405,7 +405,10 @@ describe("joiner-config-builder", () => {
         ],
       })
 
-      const schemaExpected = `type FulfillmentSet {
+      const schemaExpected = `scalar DateTime
+      scalar JSON
+      directive @enumValue(value: String) on ENUM_VALUE
+      type FulfillmentSet {
             id: ID!
             created_at: DateTime!
             updated_at: DateTime!