diff --git a/src/data/integration.ts b/src/data/integration.ts
index ce0bf07fb5..8a59d2d4d7 100644
--- a/src/data/integration.ts
+++ b/src/data/integration.ts
@@ -18,7 +18,11 @@ export interface IntegrationManifest {
   quality_scale?: string;
 }
 
-export const integrationIssuesUrl = (domain: string) =>
+export const integrationIssuesUrl = (
+  domain: string,
+  manifest: IntegrationManifest
+) =>
+  manifest.issue_tracker ||
   `https://github.com/home-assistant/home-assistant/issues?q=is%3Aissue+is%3Aopen+label%3A%22integration%3A+${domain}%22`;
 
 export const domainToName = (localize: LocalizeFunc, domain: string) =>
diff --git a/src/panels/developer-tools/info/integrations-card.ts b/src/panels/developer-tools/info/integrations-card.ts
index 3b2ecd8030..6dd26b38ba 100644
--- a/src/panels/developer-tools/info/integrations-card.ts
+++ b/src/panels/developer-tools/info/integrations-card.ts
@@ -71,12 +71,14 @@ class IntegrationsCard extends LitElement {
                               )}
                             </a>
                           </td>
-                          ${!manifest.is_built_in
-                            ? ""
-                            : html`
+                          ${manifest.is_built_in || manifest.issue_tracker
+                            ? html`
                                 <td>
                                   <a
-                                    href=${integrationIssuesUrl(domain)}
+                                    href=${integrationIssuesUrl(
+                                      domain,
+                                      manifest
+                                    )}
                                     target="_blank"
                                     rel="noreferrer"
                                   >
@@ -85,7 +87,8 @@ class IntegrationsCard extends LitElement {
                                     )}
                                   </a>
                                 </td>
-                              `}
+                              `
+                            : ""}
                         `}
                   </tr>
                 `;
diff --git a/src/panels/developer-tools/logs/dialog-system-log-detail.ts b/src/panels/developer-tools/logs/dialog-system-log-detail.ts
index f799ec0475..7db4d653c2 100644
--- a/src/panels/developer-tools/logs/dialog-system-log-detail.ts
+++ b/src/panels/developer-tools/logs/dialog-system-log-detail.ts
@@ -84,15 +84,19 @@ class DialogSystemLogDetail extends LitElement {
                           target="_blank"
                           rel="noreferrer"
                           >documentation</a
-                        >${!this._manifest.is_built_in
-                          ? ""
-                          : html`,
+                        >${this._manifest.is_built_in ||
+                        this._manifest.issue_tracker
+                          ? html`,
                               <a
-                                href=${integrationIssuesUrl(integration)}
+                                href=${integrationIssuesUrl(
+                                  integration,
+                                  this._manifest
+                                )}
                                 target="_blank"
                                 rel="noreferrer"
                                 >issues</a
-                              >`})
+                              >`
+                          : ""})
                       `}
                 `
               : ""}