diff --git a/src/app/features/registry/components/registry-statuses/registry-statuses.component.html b/src/app/features/registry/components/registry-statuses/registry-statuses.component.html
index 016932507..6fa7ed144 100644
--- a/src/app/features/registry/components/registry-statuses/registry-statuses.component.html
+++ b/src/app/features/registry/components/registry-statuses/registry-statuses.component.html
@@ -1,18 +1,15 @@
 <p-accordion class="accordion-border px-4 py-4 flex-1 no-padding">
   <p-accordion-panel value="0">
     <p-accordion-header class="flex flex-row column-gap-3 align-items-center">
-      <p class="font-bold">{{ 'registry.overview.statuses.' + registry()?.status + '.text' | translate }}</p>
+      <p class="font-bold">{{ statusTranslations().text | translate }}</p>
     </p-accordion-header>
 
     <p-accordion-content>
       <div class="flex flex-column pt-4 gap-2">
-        <h3 class="font-normal">{{ 'registry.overview.statuses.' + registry()?.status + '.short' | translate }}</h3>
+        <h3 class="font-normal">{{ statusTranslations().short | translate }}</h3>
         <p>
           <span>
-            {{
-              'registry.overview.statuses.' + registry()?.status + '.long'
-                | translate: { embargoEndDate: embargoEndDate(), email: supportEmail }
-            }}
+            {{ statusTranslations().long | translate: { embargoEndDate: embargoEndDate(), email: supportEmail } }}
           </span>
 
           @if (isAccepted()) {
diff --git a/src/app/features/registry/components/registry-statuses/registry-statuses.component.ts b/src/app/features/registry/components/registry-statuses/registry-statuses.component.ts
index abf8b81e9..85e9e8497 100644
--- a/src/app/features/registry/components/registry-statuses/registry-statuses.component.ts
+++ b/src/app/features/registry/components/registry-statuses/registry-statuses.component.ts
@@ -55,6 +55,20 @@ export class RegistryStatusesComponent {
     return date ? new Date(date).toDateString() : null;
   });
 
+  statusTranslations = computed(() => {
+    const defaultStatusKey = 'registry.overview.endEmbargo';
+
+    const status = this.registry()?.status;
+    const basePath =
+      !status || status === RegistryStatus.None ? defaultStatusKey : `registry.overview.statuses.${status}`;
+
+    return {
+      text: `${basePath}.text`,
+      short: `${basePath}.short`,
+      long: `${basePath}.long`,
+    };
+  });
+
   openWithdrawDialog(): void {
     const registry = this.registry();