diff --git a/custom_components/airscape/const.py b/custom_components/airscape/const.py
index ea475c5..11f99ee 100644
--- a/custom_components/airscape/const.py
+++ b/custom_components/airscape/const.py
@@ -10,4 +10,5 @@
     "interlock1": "interlock1",
     "interlock2": "interlock2",
     "timeremaining": "shutoff_timer",
+    "macaddr": "macaddr",
 }
diff --git a/custom_components/airscape/fan.py b/custom_components/airscape/fan.py
index 38b262f..4e9f145 100644
--- a/custom_components/airscape/fan.py
+++ b/custom_components/airscape/fan.py
@@ -100,6 +100,11 @@ def __init__(self, device, name, minimum):
         self._minimum_speed = minimum
         self._attr = {}
 
+    @property
+    def unique_id(self):
+        """Return a unique id based on the MAC address."""
+        return self._attr['macaddr']
+
     @property
     def name(self):
         """Return the display name of this fan."""
diff --git a/custom_components/airscape/manifest.json b/custom_components/airscape/manifest.json
index 2a8b18e..17d9a41 100644
--- a/custom_components/airscape/manifest.json
+++ b/custom_components/airscape/manifest.json
@@ -3,7 +3,7 @@
     "name": "Airscape Whole House Fan",
     "documentation": "https://www.home-assistant.io/components/fan.airscape",
     "issue_tracker": "https://github.com/quielb/hass-airscape/issues",
-    "version": "0.1.9.5.1",
+    "version": "0.1.9.5.5",
     "requirements": [
         "airscape==0.1.9.4.1"
     ],
diff --git a/info.md b/info.md
index 09020ba..a100be5 100644
--- a/info.md
+++ b/info.md
@@ -17,6 +17,11 @@ A Home Assistant custom component to control Airscape Whole House Fans with Gen2
   {% endif %}
 
 ### Changes
+{% if version_installed.replace("v", "").replace(".","") | int < 1955  %}
+
+- Adding unique ids to all fan entities which will allow them to be configured via the UI.
+  {% endif %}
+
 
 {% if version_installed.replace("v", "").replace(".","") | int < 1951  %}