diff --git a/frontend/src/app/ui/admin/description-template/listing/description-template-listing.component.ts b/frontend/src/app/ui/admin/description-template/listing/description-template-listing.component.ts
index 5439a7c5a..2dcaeddf3 100644
--- a/frontend/src/app/ui/admin/description-template/listing/description-template-listing.component.ts
+++ b/frontend/src/app/ui/admin/description-template/listing/description-template-listing.component.ts
@@ -62,6 +62,7 @@ export class DescriptionTemplateListingComponent extends BaseListingComponent<De
 		nameof<DescriptionTemplate>(x => x.description),
 		nameof<DescriptionTemplate>(x => x.status),
 		nameof<DescriptionTemplate>(x => x.version),
+		nameof<DescriptionTemplate>(x => x.versionStatus),
 		nameof<DescriptionTemplate>(x => x.groupId),
 		nameof<DescriptionTemplate>(x => x.updatedAt),
 		nameof<DescriptionTemplate>(x => x.createdAt),
@@ -220,7 +221,7 @@ export class DescriptionTemplateListingComponent extends BaseListingComponent<De
 	}
 
 	public canAddNewVersion(descriptionTemplate: DescriptionTemplate): boolean {	
-		return descriptionTemplate.belongsToCurrentTenant != false && descriptionTemplate.isActive == IsActive.Active && this.canCreateNew();
+		return descriptionTemplate.versionStatus == DescriptionTemplateVersionStatus.Current && descriptionTemplate.status == DescriptionTemplateStatus.Finalized && descriptionTemplate.belongsToCurrentTenant != false && descriptionTemplate.isActive == IsActive.Active && this.canCreateNew();
 	}
 
 	public canClone(descriptionTemplate: DescriptionTemplate): boolean {
diff --git a/frontend/src/app/ui/admin/plan-blueprint/listing/plan-blueprint-listing.component.ts b/frontend/src/app/ui/admin/plan-blueprint/listing/plan-blueprint-listing.component.ts
index 1a5744542..12b75e00e 100644
--- a/frontend/src/app/ui/admin/plan-blueprint/listing/plan-blueprint-listing.component.ts
+++ b/frontend/src/app/ui/admin/plan-blueprint/listing/plan-blueprint-listing.component.ts
@@ -59,6 +59,7 @@ export class PlanBlueprintListingComponent extends BaseListingComponent<PlanBlue
 		nameof<PlanBlueprint>(x => x.code),
 		nameof<PlanBlueprint>(x => x.status),
 		nameof<PlanBlueprint>(x => x.version),
+		nameof<PlanBlueprint>(x => x.versionStatus),
 		nameof<PlanBlueprint>(x => x.groupId),
 		nameof<PlanBlueprint>(x => x.updatedAt),
 		nameof<PlanBlueprint>(x => x.createdAt),
@@ -108,7 +109,7 @@ export class PlanBlueprintListingComponent extends BaseListingComponent<PlanBlue
     }
 
     protected canCreateNewVersion(blueprint: PlanBlueprint): boolean {
-        return blueprint?.belongsToCurrentTenant != false && (blueprint?.status === PlanBlueprintStatus.Finalized || blueprint?.status == null) && blueprint?.isActive === IsActive.Active;
+        return blueprint?.status === PlanBlueprintStatus.Finalized && blueprint?.versionStatus == PlanBlueprintVersionStatus.Current && blueprint?.belongsToCurrentTenant != false && blueprint?.isActive === IsActive.Active;
     }
 
     protected canDelete(blueprint: PlanBlueprint): boolean {