diff --git a/homeassistant/components/demo/alarm_control_panel.py b/homeassistant/components/demo/alarm_control_panel.py
index f95042f2cc7..d1b558842b6 100644
--- a/homeassistant/components/demo/alarm_control_panel.py
+++ b/homeassistant/components/demo/alarm_control_panel.py
@@ -30,9 +30,10 @@ async def async_setup_entry(
     """Set up the Demo config entry."""
     async_add_entities(
         [
-            DemoAlarm(  # type:ignore[no-untyped-call]
+            ManualAlarm(  # type:ignore[no-untyped-call]
                 hass,
                 "Security",
+                "demo_alarm_control_panel",
                 "1234",
                 None,
                 True,
@@ -74,9 +75,3 @@ async def async_setup_entry(
             )
         ]
     )
-
-
-class DemoAlarm(ManualAlarm):
-    """Demo Alarm Control Panel."""
-
-    _attr_unique_id = "demo_alarm_control_panel"
diff --git a/homeassistant/components/manual/alarm_control_panel.py b/homeassistant/components/manual/alarm_control_panel.py
index 5b344dd01ac..422a9726e81 100644
--- a/homeassistant/components/manual/alarm_control_panel.py
+++ b/homeassistant/components/manual/alarm_control_panel.py
@@ -21,6 +21,7 @@ from homeassistant.const import (
     CONF_NAME,
     CONF_PLATFORM,
     CONF_TRIGGER_TIME,
+    CONF_UNIQUE_ID,
     STATE_ALARM_ARMED_AWAY,
     STATE_ALARM_ARMED_CUSTOM_BYPASS,
     STATE_ALARM_ARMED_HOME,
@@ -122,6 +123,7 @@ PLATFORM_SCHEMA = vol.Schema(
         {
             vol.Required(CONF_PLATFORM): "manual",
             vol.Optional(CONF_NAME, default=DEFAULT_ALARM_NAME): cv.string,
+            vol.Optional(CONF_UNIQUE_ID): cv.string,
             vol.Exclusive(CONF_CODE, "code validation"): cv.string,
             vol.Exclusive(CONF_CODE_TEMPLATE, "code validation"): cv.template,
             vol.Optional(CONF_CODE_ARM_REQUIRED, default=True): cv.boolean,
@@ -179,6 +181,7 @@ def setup_platform(
             ManualAlarm(
                 hass,
                 config[CONF_NAME],
+                config.get(CONF_UNIQUE_ID),
                 config.get(CONF_CODE),
                 config.get(CONF_CODE_TEMPLATE),
                 config.get(CONF_CODE_ARM_REQUIRED),
@@ -205,6 +208,7 @@ class ManualAlarm(AlarmControlPanelEntity, RestoreEntity):
         self,
         hass,
         name,
+        unique_id,
         code,
         code_template,
         code_arm_required,
@@ -215,6 +219,7 @@ class ManualAlarm(AlarmControlPanelEntity, RestoreEntity):
         self._state = STATE_ALARM_DISARMED
         self._hass = hass
         self._attr_name = name
+        self._attr_unique_id = unique_id
         if code_template:
             self._code = code_template
             self._code.hass = hass