diff --git a/src/monitoring/service/EventTools.py b/src/monitoring/service/EventTools.py
index 6d017b627e2d464efbb67c7903afa529176bccd3..8b8f0179b9438fd5822ded6011ddbc3e1bc3f87f 100644
--- a/src/monitoring/service/EventTools.py
+++ b/src/monitoring/service/EventTools.py
@@ -93,12 +93,9 @@ class EventsDeviceCollector:
 
                             kpi_id = self._monitoring_client.CreateKpi(kpi_descriptor)
                             kpi_id_list.append(kpi_id)
-
             return kpi_id_list
-
         except ServiceException as e:
             LOGGER.exception('ListenEvents exception')
-
         except Exception as e:  # pragma: no cover
             LOGGER.exception('ListenEvents exception')
 
diff --git a/src/monitoring/tests/test_unitary.py b/src/monitoring/tests/test_unitary.py
index ca27f1c8a95389578631202b67f00bf8c560a4d6..87a4b4d3e33d3ea6c69b569f4008d794574226f6 100644
--- a/src/monitoring/tests/test_unitary.py
+++ b/src/monitoring/tests/test_unitary.py
@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import copy, logging, os, pytest
+from time import sleep
 from typing import Tuple
 from common.Constants import ServiceNameEnum
 from common.Settings import (
@@ -414,6 +415,9 @@ def test_listen_events(
     response = device_client.AddDevice(Device(**device_with_connect_rules))
     assert response.device_uuid.uuid == DEVICE_DEV1_UUID
 
+    sleep(0.1)
+
     kpi_id_list = events_collector.listen_events()
 
     assert len(kpi_id_list) > 0
+    events_collector.stop()