diff --git a/public/app/features/manage-dashboards/components/PublicDashboardListTable/PublicDashboardListTable.tsx b/public/app/features/manage-dashboards/components/PublicDashboardListTable/PublicDashboardListTable.tsx
index a50d149cee7..171289c149a 100644
--- a/public/app/features/manage-dashboards/components/PublicDashboardListTable/PublicDashboardListTable.tsx
+++ b/public/app/features/manage-dashboards/components/PublicDashboardListTable/PublicDashboardListTable.tsx
@@ -145,23 +145,43 @@ export const PublicDashboardListTable = () => {
         {!isLoading && !isError && !!paginatedPublicDashboards && (
           <div>
             {paginatedPublicDashboards.publicDashboards.length === 0 ? (
-              <EmptyState
-                variant="call-to-action"
-                message={t(
-                  'public-dashboard-list.empty-state.message',
-                  "You haven't created any public dashboards yet"
-                )}
-              >
-                <Trans i18nKey="public-dashboard-list.empty-state.more-info">
-                  Create a public dashboard from any existing dashboard through the <b>Share</b> modal.{' '}
-                  <TextLink
-                    external
-                    href="https://grafana.com/docs/grafana/latest/dashboards/dashboard-public/#make-a-dashboard-public"
-                  >
-                    Learn more
-                  </TextLink>
-                </Trans>
-              </EmptyState>
+              config.featureToggles.newDashboardSharingComponent ? (
+                <EmptyState
+                  variant="call-to-action"
+                  message={t(
+                    'shared-dashboard-list.empty-state.message',
+                    "You haven't created any shared dashboards yet"
+                  )}
+                >
+                  <Trans i18nKey="shared-dashboard-list.empty-state.more-info">
+                    Create a shared dashboard from any existing dashboard through the <b>Share</b> modal.{' '}
+                    <TextLink
+                      external
+                      href="https://grafana.com/docs/grafana/latest/dashboards/share-dashboards-panels/shared-dashboards"
+                    >
+                      Learn more
+                    </TextLink>
+                  </Trans>
+                </EmptyState>
+              ) : (
+                <EmptyState
+                  variant="call-to-action"
+                  message={t(
+                    'public-dashboard-list.empty-state.message',
+                    "You haven't created any public dashboards yet"
+                  )}
+                >
+                  <Trans i18nKey="public-dashboard-list.empty-state.more-info">
+                    Create a public dashboard from any existing dashboard through the <b>Share</b> modal.{' '}
+                    <TextLink
+                      external
+                      href="https://grafana.com/docs/grafana/latest/dashboards/dashboard-public/#make-a-dashboard-public"
+                    >
+                      Learn more
+                    </TextLink>
+                  </Trans>
+                </EmptyState>
+              )
             ) : (
               <>
                 <ul className={styles.list}>
diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json
index 7614f6741d7..0df4ec38e38 100644
--- a/public/locales/en-US/grafana.json
+++ b/public/locales/en-US/grafana.json
@@ -2350,6 +2350,10 @@
       "revoke-button-tooltip": "Revoke access",
       "view-button-tooltip": "View shared dashboard"
     },
+    "empty-state": {
+      "message": "You haven't created any shared dashboards yet",
+      "more-info": "Create a shared dashboard from any existing dashboard through the <1>Share</1> modal. <4>Learn more</4>"
+    },
     "toggle": {
       "pause-sharing-toggle-text": "Pause access"
     }
diff --git a/public/locales/pseudo-LOCALE/grafana.json b/public/locales/pseudo-LOCALE/grafana.json
index 08a11b6551e..bda49fe87ed 100644
--- a/public/locales/pseudo-LOCALE/grafana.json
+++ b/public/locales/pseudo-LOCALE/grafana.json
@@ -2350,6 +2350,10 @@
       "revoke-button-tooltip": "Ŗęvőĸę äččęşş",
       "view-button-tooltip": "Vįęŵ şĥäřęđ đäşĥþőäřđ"
     },
+    "empty-state": {
+      "message": "Ÿőū ĥävęʼn'ŧ čřęäŧęđ äʼny şĥäřęđ đäşĥþőäřđş yęŧ",
+      "more-info": "Cřęäŧę ä şĥäřęđ đäşĥþőäřđ ƒřőm äʼny ęχįşŧįʼnģ đäşĥþőäřđ ŧĥřőūģĥ ŧĥę <1>Ŝĥäřę</1> mőđäľ. <4>Ŀęäřʼn mőřę</4>"
+    },
     "toggle": {
       "pause-sharing-toggle-text": "Päūşę äččęşş"
     }