diff --git a/CHANGELOG.md b/CHANGELOG.md
index 470b77d..28647ab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 2.1.1 (2024-04-17)
+
+### Bug Fixes
+
+- Fix `stop_switch_entity_id` not being present causing the integration to crash
+
+
 ## 2.1.0 (2024-04-11)
 
 ### Features
diff --git a/custom_components/cover_time_based/cover.py b/custom_components/cover_time_based/cover.py
index c068d1f..46b1946 100644
--- a/custom_components/cover_time_based/cover.py
+++ b/custom_components/cover_time_based/cover.py
@@ -61,7 +61,9 @@
                     vol.Required(CONF_NAME): cv.string,
                     vol.Required(CONF_OPEN_SWITCH_ENTITY_ID): cv.entity_id,
                     vol.Required(CONF_CLOSE_SWITCH_ENTITY_ID): cv.entity_id,
-                    vol.Optional(CONF_STOP_SWITCH_ENTITY_ID): cv.entity_id,
+                    vol.Optional(
+                        CONF_STOP_SWITCH_ENTITY_ID, default=None
+                    ): vol.Any(cv.entity_id, None),
                     vol.Optional(
                         CONF_TRAVELLING_TIME_DOWN, default=DEFAULT_TRAVEL_TIME
                     ): cv.positive_int,
diff --git a/custom_components/cover_time_based/manifest.json b/custom_components/cover_time_based/manifest.json
index 03e5362..3b4ad4c 100644
--- a/custom_components/cover_time_based/manifest.json
+++ b/custom_components/cover_time_based/manifest.json
@@ -9,5 +9,5 @@
   "requirements": [
     "xknx==0.9.4"
   ],
-  "version": "2.1.0"
+  "version": "2.1.1"
 }