diff --git a/packages/services/api/src/modules/schema/providers/schema-version-helper.ts b/packages/services/api/src/modules/schema/providers/schema-version-helper.ts
index a480938c7..24e4bde70 100644
--- a/packages/services/api/src/modules/schema/providers/schema-version-helper.ts
+++ b/packages/services/api/src/modules/schema/providers/schema-version-helper.ts
@@ -280,11 +280,15 @@ export class SchemaVersionHelper {
   }
 
   async getIsFirstComposableVersion(schemaVersion: SchemaVersion) {
+    if (!schemaVersion.isComposable) {
+      return false;
+    }
+
     if (schemaVersion.recordVersion === '2024-01-10') {
       return schemaVersion.diffSchemaVersionId === null;
     }
 
-    if (schemaVersion.hasPersistedSchemaChanges && schemaVersion.isComposable) {
+    if (schemaVersion.hasPersistedSchemaChanges) {
       const previousVersion = await this.getPreviousDiffableSchemaVersion(schemaVersion);
       if (previousVersion === null) {
         return true;