diff --git a/src/panels/config/areas/ha-config-area-page.ts b/src/panels/config/areas/ha-config-area-page.ts
index 2ec77fcfa0..ec0085aacd 100644
--- a/src/panels/config/areas/ha-config-area-page.ts
+++ b/src/panels/config/areas/ha-config-area-page.ts
@@ -261,11 +261,7 @@ class HaConfigAreaPage extends LitElement {
                           return state
                             ? html`
                                 <a
-                                  href=${ifDefined(
-                                    state.attributes.id
-                                      ? `/config/script/edit/${state.attributes.id}`
-                                      : undefined
-                                  )}
+                                  href=${`/config/script/edit/${state.entity_id}`}
                                 >
                                   <paper-item>
                                     <paper-item-body>
diff --git a/src/panels/config/devices/ha-config-device-page.ts b/src/panels/config/devices/ha-config-device-page.ts
index 34d25caf7b..927012efe0 100644
--- a/src/panels/config/devices/ha-config-device-page.ts
+++ b/src/panels/config/devices/ha-config-device-page.ts
@@ -420,11 +420,7 @@ export class HaConfigDevicePage extends LitElement {
                               return state
                                 ? html`
                                     <a
-                                      href=${ifDefined(
-                                        state.attributes.id
-                                          ? `/config/script/edit/${state.attributes.id}`
-                                          : undefined
-                                      )}
+                                      href=${`/config/script/edit/${state.entity_id}`}
                                     >
                                       <paper-item .script=${script}>
                                         <paper-item-body>