diff --git a/watcher/common/messaging/messaging_handler.py b/watcher/common/messaging/messaging_handler.py
index 4404222c1..8932a362a 100644
--- a/watcher/common/messaging/messaging_handler.py
+++ b/watcher/common/messaging/messaging_handler.py
@@ -79,6 +79,7 @@ class MessagingHandler(threading.Thread):
     def build_server(self, target):
         return om.get_rpc_server(self.__transport, target,
                                  self.__endpoints,
+                                 executor='evenlet',
                                  serializer=self.__serializer)
 
     def _configure(self):
diff --git a/watcher/tests/common/messaging/test_messaging_handler.py b/watcher/tests/common/messaging/test_messaging_handler.py
index 3e24a78af..683c70f16 100644
--- a/watcher/tests/common/messaging/test_messaging_handler.py
+++ b/watcher/tests/common/messaging/test_messaging_handler.py
@@ -58,6 +58,7 @@ class TestMessagingHandler(base.TestCase):
             handler.transport,
             m_target,
             [self.ENDPOINT],
+            executor='evenlet',
             serializer=None,
         )