diff --git a/custom_components/ocpp/api.py b/custom_components/ocpp/api.py
index 73193488..b7fbe8bb 100644
--- a/custom_components/ocpp/api.py
+++ b/custom_components/ocpp/api.py
@@ -1002,7 +1002,7 @@ async def monitor_connection(self):
 
     async def _handle_call(self, msg):
         try:
-            await super()._handle_call(msg)
+            await self.hass.async_create_task(super()._handle_call(msg))
         except NotImplementedError as e:
             response = msg.create_call_error(e).to_json()
             await self._send(response)
diff --git a/tests/test_charge_point.py b/tests/test_charge_point.py
index 92abf626..ab23fe34 100644
--- a/tests/test_charge_point.py
+++ b/tests/test_charge_point.py
@@ -183,7 +183,7 @@ async def test_services(hass, socket_enabled):
                         cp2.send_stop_transaction(),
                         cp2.send_meter_periodic_data(),
                     ),
-                    timeout=5,
+                    timeout=10,
                 )
             except asyncio.TimeoutError:
                 pass