diff --git a/custom_components/presence_simulation/__init__.py b/custom_components/presence_simulation/__init__.py
index 6b1f07a..d05acb2 100644
--- a/custom_components/presence_simulation/__init__.py
+++ b/custom_components/presence_simulation/__init__.py
@@ -44,6 +44,7 @@ async def stop_presence_simulation(err=None, restart=False, switch_id=None):
         """Stop the presence simulation, raising a potential error"""
         #get the switch entity
         entity = hass.data[DOMAIN][SWITCH_PLATFORM][switch_id]
+
         #set the state of the switch to off. Not calling turn_off to avoid calling the stop service again
         entity.internal_turn_off()
         if not restart:
@@ -75,7 +76,13 @@ async def handle_stop_presence_simulation(call, restart=False, switch_id=None):
         """Stop the presence simulation"""
         _LOGGER.debug("Stopped presence simulation")
         if call is not None: #if we are here, it is a call of the service, or a restart at the end of a cycle
-            switch_id = call.data.get("switch_id")
+            if "switch_id" in call.data:
+                switch_id = call.data.get("switch_id")
+            elif len(hass.data[DOMAIN][SWITCH_PLATFORM]) == 1:
+                switch_id = list(hass.data[DOMAIN][SWITCH_PLATFORM])[0]
+            else:
+                _LOGGER.error("Since you have several presence simulation switch, you have to add a switch_id parameter in the service call")
+                return
 
         await stop_presence_simulation(restart=restart, switch_id=switch_id)
 
@@ -106,10 +113,20 @@ async def handle_presence_simulation(call, restart=False, switch_id=None):
         after_ha_restart=False
         if call is not None: #if we are here, it is a call of the service, or a restart at the end of a cycle, or a restore after a HA restart
             #get the switch entity
-            switch_id = call.data.get("switch_id")
-            #internal = ("internal" in call.data) and call.data.get("internal")
+            _LOGGER.debug("All Switches: %s", hass.data[DOMAIN][SWITCH_PLATFORM])
+            for id in hass.data[DOMAIN][SWITCH_PLATFORM]:
+                _LOGGER.debug(hass.data[DOMAIN][SWITCH_PLATFORM][id])
+            if "switch_id" in call.data:
+                switch_id = call.data.get("switch_id")
+                #internal = ("internal" in call.data) and call.data.get("internal")
+                entity = hass.data[DOMAIN][SWITCH_PLATFORM][switch_id]
+            elif len(hass.data[DOMAIN][SWITCH_PLATFORM]) == 1:
+                switch_id = list(hass.data[DOMAIN][SWITCH_PLATFORM])[0]
+                entity = hass.data[DOMAIN][SWITCH_PLATFORM][switch_id]
+            else:
+                _LOGGER.error("Since you have several presence simulation switch, you have to add a switch_id parameter in the service call")
+                return
             internal = call.data.get("internal", False) and call.data.get("internal")
-            entity = hass.data[DOMAIN][SWITCH_PLATFORM][switch_id]
             if not is_running(switch_id) and not internal:
                 if "entity_id" in call.data:
                     if isinstance(call.data.get("entity_id"), list):
@@ -212,7 +229,15 @@ def handle_presence_simulation_sync(hass, call, minus_delta, expanded_entities,
 
     async def handle_toggle_presence_simulation(call):
         """Toggle the presence simulation"""
-        if is_running(call.data.get("switch_id")):
+        if "switch_id" in call.data:
+            switch_id = call.data.get("switch_id")
+        elif len(hass.data[DOMAIN][SWITCH_PLATFORM]) == 1:
+            switch_id = list(hass.data[DOMAIN][SWITCH_PLATFORM])[0]
+        else:
+            _LOGGER.error("Since you have several presence simulation switch, you have to add a switch_id parameter in the service call")
+            return
+
+        if is_running(switch_id):
             await handle_stop_presence_simulation(call, restart=False)
         else:
             await handle_presence_simulation(call, restart=False)
@@ -270,7 +295,7 @@ async def simulate_single_entity(switch_id, entity_id, hist, delta, random_val):
                     target_time = datetime.now(timezone.utc) + timedelta(MIN_DELAY / 60 / 60 / 24)
                     _LOGGER.debug("target_time after %s", target_time)
                 else:
-                    _LOGGER.debug("initial_secs_left %s, target_time", initial_secs_left, target_time)
+                    _LOGGER.debug("initial_secs_left %s, target_time %s", initial_secs_left, target_time)
 
             await entity.async_add_next_event(target_time, entity_id, state.state)