diff --git a/addons/core/translations/resources/en-us.yaml b/addons/core/translations/resources/en-us.yaml
index 87c2966294..4d1a6270e4 100644
--- a/addons/core/translations/resources/en-us.yaml
+++ b/addons/core/translations/resources/en-us.yaml
@@ -439,6 +439,7 @@ storage-bucket:
   plugin-types:
     aws: Amazon S3
     minio: MinIO
+    unknown: Unknown
   form:
     scope:
       label: Scope
diff --git a/ui/admin/app/routes/scopes/scope/targets/target/index.js b/ui/admin/app/routes/scopes/scope/targets/target/index.js
index 8e68d20afa..14699e7593 100644
--- a/ui/admin/app/routes/scopes/scope/targets/target/index.js
+++ b/ui/admin/app/routes/scopes/scope/targets/target/index.js
@@ -29,8 +29,20 @@ export default class ScopesScopeTargetsTargetIndexRoute extends Route {
         'storage-bucket',
         storage_bucket_id,
       );
-      const storage_bucket_name = storageBucket.displayName;
-      controller.set('storage_bucket_name', storage_bucket_name);
+      const {
+        displayName: name,
+        plugin: { name: plugin_name },
+        isAWS,
+        isMinIO,
+        isUnknown,
+      } = storageBucket;
+      let icon;
+      if (isAWS) {
+        icon = 'aws';
+      } else if (isMinIO) {
+        icon = 'cloud-upload';
+      }
+      controller.set('storage_bucket', { name, plugin_name, icon, isUnknown });
     }
   }
 }
diff --git a/ui/admin/app/templates/scopes/scope/targets/target/index.hbs b/ui/admin/app/templates/scopes/scope/targets/target/index.hbs
index 1f9ba53595..ecf13b02cb 100644
--- a/ui/admin/app/templates/scopes/scope/targets/target/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/targets/target/index.hbs
@@ -4,7 +4,6 @@
 }}
 
 <Rose::Layout::Page as |page|>
-
   <page.breadcrumbs>
     <Breadcrumbs::Container />
   </page.breadcrumbs>
@@ -36,7 +35,9 @@
       <bc.Sidebar>
         {{#if @model.aliases}}
           <div class='target-sidebar-aliases'>
-            <h3>{{t 'resources.alias.title_plural'}}</h3>
+            <h3>
+              {{t 'resources.alias.title_plural'}}
+            </h3>
             <p class='description'>
               {{t 'resources.alias.form.sidebar.help'}}
             </p>
@@ -92,7 +93,9 @@
         {{else}}
           {{#if (can 'create model' this.globalScope collection='aliases')}}
             <div class='target-sidebar-aliases'>
-              <h3>{{t 'resources.alias.title_plural'}}</h3>
+              <h3>
+                {{t 'resources.alias.title_plural'}}
+              </h3>
               <p class='description'>
                 {{t 'resources.alias.form.sidebar.help'}}
               </p>
@@ -108,31 +111,47 @@
         {{/if}}
         <div class='target-sidebar'>
           {{#if (and @model.isSSH (feature-flag 'ssh-session-recording'))}}
-            <h3>{{t 'resources.target.form.sidebar.label'}}</h3>
+            <h3>
+              {{t 'resources.target.form.sidebar.label'}}
+            </h3>
             <p class='description'>
               {{t 'resources.target.form.sidebar.help'}}
             </p>
             {{#if @model.enable_session_recording}}
-              <LinkListPanel as |P|>
-                <P.Item
-                  @icon='cloud-upload'
-                  @color='boundary'
-                  @text={{this.storage_bucket_name}}
-                  @route='scopes.scope.storage-buckets.storage-bucket'
-                  @model={{@model.storage_bucket_id}}
-                >
-                  <Hds::Badge
-                    @text={{t 'resources.storage-bucket.types.aws_s3'}}
-                    @icon='aws'
-                  />
-                </P.Item>
-              </LinkListPanel>
-              <Hds::Link::Standalone
-                @icon='arrow-right'
-                @iconPosition='trailing'
-                @text={{t 'resources.target.form.sidebar.link'}}
-                @route='scopes.scope.targets.target.enable-session-recording'
-              />
+              {{#unless this.storage_bucket.isUnknown}}
+                <LinkListPanel as |P|>
+                  <P.Item
+                    @icon='cloud-upload'
+                    @color='boundary'
+                    @text={{this.storage_bucket.name}}
+                    @route='scopes.scope.storage-buckets.storage-bucket'
+                    @model={{@model.storage_bucket_id}}
+                  >
+                    <Hds::Badge
+                      @text={{t
+                        (concat
+                          'resources.storage-bucket.plugin-types.'
+                          this.storage_bucket.plugin_name
+                        )
+                      }}
+                      @icon={{this.storage_bucket.icon}}
+                    />
+                  </P.Item>
+                </LinkListPanel>
+                <Hds::Link::Standalone
+                  @icon='arrow-right'
+                  @iconPosition='trailing'
+                  @text={{t 'resources.target.form.sidebar.link'}}
+                  @route='scopes.scope.targets.target.enable-session-recording'
+                />
+              {{/unless}}
+              {{#if this.storage_bucket.isUnknown}}
+                <LinkListPanel as |P|>
+                  <P.Item @color='boundary' @text={{this.storage_bucket.name}}>
+                    {{t 'resources.storage-bucket.plugin-types.unknown'}}
+                  </P.Item>
+                </LinkListPanel>
+              {{/if}}
             {{else}}
               <Hds::Button
                 @text={{t 'resources.target.actions.enable-recording'}}