diff --git a/addons/core/translations/resources/en-us.yaml b/addons/core/translations/resources/en-us.yaml
index 9d8564288..72f062f7b 100644
--- a/addons/core/translations/resources/en-us.yaml
+++ b/addons/core/translations/resources/en-us.yaml
@@ -270,7 +270,10 @@ target:
 credential-store:
   title: Credential Store
   title_plural: Credential Stores
-  description: A credential stores is a collection of credentials and credential libraries.
+  description: A credential store is a collection of credentials and credential libraries.
+  messages:
+    welcome:
+      title: Welcome to Credential Stores
   actions:
     delete: Delete Credential Store
 credential-library:
diff --git a/ui/admin/app/templates/scopes/scope/credential-stores/index.hbs b/ui/admin/app/templates/scopes/scope/credential-stores/index.hbs
index c8ff3b098..7b6e88c9e 100644
--- a/ui/admin/app/templates/scopes/scope/credential-stores/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/credential-stores/index.hbs
@@ -8,7 +8,9 @@
       {{t 'resources.credential-store.title_plural'}}
       <DocLink @doc='credential-stores' @iconSize='large' />
     </h2>
-    <p>{{t 'resources.credential-store.description'}}</p>
+    {{#if @model}}
+      <p>{{t 'resources.credential-store.description'}}</p>
+    {{/if}}
   </page.header>
 
   <page.actions>
@@ -61,6 +63,25 @@
           {{/each}}
         </table.body>
       </Rose::Table>
+
+    {{else}}
+      <Rose::Layout::Centered>
+        <Rose::Message
+          @title={{t 'resources.credential-store.messages.welcome.title'}}
+          as |message|
+        >
+          <message.description>
+            {{t 'resources.credential-store.description'}}
+          </message.description>
+          <message.link @route='scopes.scope.credential-stores.new'>
+            <Rose::Icon @name='plus-circle-outline' />
+            {{t 'titles.new'}}
+          </message.link>
+        </Rose::Message>
+      </Rose::Layout::Centered>
+
     {{/if}}
+
   </page.body>
+
 </Rose::Layout::Page>
\ No newline at end of file