diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/lifecycle/AppVersionTracker.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/lifecycle/AppVersionTracker.java
index f2d00cfca..417de9da2 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/lifecycle/AppVersionTracker.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/lifecycle/AppVersionTracker.java
@@ -39,6 +39,11 @@ public class AppVersionTracker {
                         return;
                     }
 
+                    if (appVersion.isBlank() || layoutParserVersion.isBlank()) {
+                        log.info("No app version or layout parser version was provided. Version tracking skipped. ");
+                        return;
+                    }
+
                     TenantContext.setTenantId(tenant.getTenantId());
 
                     try {
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/migration/migrations/V32RankDeduplicationMigration.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/migration/migrations/V32RankDeduplicationMigration.java
new file mode 100644
index 000000000..911f0bae4
--- /dev/null
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/migration/migrations/V32RankDeduplicationMigration.java
@@ -0,0 +1,35 @@
+package com.iqser.red.service.persistence.management.v1.processor.migration.migrations;
+
+import org.springframework.stereotype.Service;
+
+import com.iqser.red.service.persistence.management.v1.processor.migration.Migration;
+import com.iqser.red.service.persistence.management.v1.processor.migration.RankDeDuplicationService;
+
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Service
+public class V32RankDeduplicationMigration extends Migration {
+
+    private static final String NAME = "Adding to the migration the rank de-duplication";
+    private static final long VERSION = 32;
+
+    private final RankDeDuplicationService rankDeDuplicationService;
+
+
+    public V32RankDeduplicationMigration(RankDeDuplicationService rankDeDuplicationService) {
+
+        super(NAME, VERSION);
+        this.rankDeDuplicationService = rankDeDuplicationService;
+    }
+
+
+    @Override
+    protected void migrate() {
+
+        log.info("Migration: Checking for duplicate ranks");
+        rankDeDuplicationService.deduplicate();
+
+    }
+
+}