diff --git a/ui/admin/app/routes/scopes/scope/session-recordings/session-recording/channels-by-connection.js b/ui/admin/app/routes/scopes/scope/session-recordings/session-recording/channels-by-connection.js
index 64a92231d..04b5f2c31 100644
--- a/ui/admin/app/routes/scopes/scope/session-recordings/session-recording/channels-by-connection.js
+++ b/ui/admin/app/routes/scopes/scope/session-recordings/session-recording/channels-by-connection.js
@@ -7,7 +7,6 @@ import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
 import { notifySuccess, notifyError } from 'core/decorators/notify';
-import { STATE_SESSION_RECORDING_AVAILABLE } from 'api/models/session-recording';
 
 export default class ScopesScopeSessionRecordingsSessionRecordingChannelsByConnectionRoute extends Route {
   // =services
@@ -58,10 +57,10 @@ export default class ScopesScopeSessionRecordingsSessionRecordingChannelsByConne
    */
   @action
   @notifyError(({ message }) => message, { catch: true })
-  @notifySuccess(({ state }) =>
-    state === STATE_SESSION_RECORDING_AVAILABLE
-      ? 'resources.policy.messages.reapply'
-      : 'resources.policy.messages.later',
+  @notifySuccess(({ end_time }) =>
+    !end_time
+      ? 'resources.policy.messages.later'
+      : 'resources.policy.messages.reapply',
   )
   async reapplyStoragepolicy(sessionRecording) {
     await sessionRecording.reapplyStoragePolicy();
diff --git a/ui/admin/app/templates/scopes/scope/session-recordings/session-recording/channels-by-connection/index.hbs b/ui/admin/app/templates/scopes/scope/session-recordings/session-recording/channels-by-connection/index.hbs
index f1d51c38a..4056d8805 100644
--- a/ui/admin/app/templates/scopes/scope/session-recordings/session-recording/channels-by-connection/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/session-recordings/session-recording/channels-by-connection/index.hbs
@@ -252,7 +252,16 @@
                       @model.sessionRecording.retain_until
                     }}
                   >
-                    {{format-date-iso @model.sessionRecording.retain_until}}
+                    {{#if
+                      (eq
+                        (format-date-iso @model.sessionRecording.retain_until)
+                        '9999-12-31T23:23:23.999Z'
+                      )
+                    }}
+                      {{t 'resources.policy.titles.forever'}}
+                    {{else}}
+                      {{format-date-iso @model.sessionRecording.retain_until}}
+                    {{/if}}
                   </time>
                 </list.Item>
               {{/if}}