diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/HapiFhirJpaMigrationTasks.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/HapiFhirJpaMigrationTasks.java
index 47550372c64..a5a14f95b2d 100644
--- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/HapiFhirJpaMigrationTasks.java
+++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/HapiFhirJpaMigrationTasks.java
@@ -273,17 +273,18 @@ public class HapiFhirJpaMigrationTasks extends BaseMigrationTasks<VersionEnum> {
 		replaceNumericSPIndices(version);
 		replaceQuantitySPIndices(version);
 
+		// Drop Index on HFJ_RESOURCE.INDEX_STATUS
+		version
+			.onTable("HFJ_RESOURCE")
+			.dropIndex("20220314.1", "IDX_INDEXSTATUS");
+		
+		// Fix for https://github.com/hapifhir/hapi-fhir-jpaserver-starter/issues/328
 		version.onTable("NPM_PACKAGE_VER")
 			.modifyColumn("20220329.1","FHIR_VERSION_ID").nonNullable().withType(ColumnTypeEnum.STRING, 20);
 
 		version.onTable("NPM_PACKAGE_VER_RES")
 			.modifyColumn("20220329.2","FHIR_VERSION_ID").nonNullable().withType(ColumnTypeEnum.STRING, 20);
 
-		// Drop Index on HFJ_RESOURCE.INDEX_STATUS
-		version
-			.onTable("HFJ_RESOURCE")
-			.dropIndex("20220314.1", "IDX_INDEXSTATUS");
-
 		version
 			.onTable("BT2_JOB_INSTANCE")
 			.addColumn("20220416.1", "CUR_GATED_STEP_ID")