From 8483bd506f361b2ba04b7e1291c78e34bdd8656f Mon Sep 17 00:00:00 2001
From: Kamil Kisiela <kamil.kisiela@gmail.com>
Date: Thu, 2 Jan 2025 16:04:35 +0100
Subject: [PATCH] Fix logic behind SchemaVersion.isFirstComposableVersion
 (#5402)

---
 .../src/modules/schema/providers/schema-version-helper.ts   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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;