diff --git a/vitrage/api_handler/service.py b/vitrage/api_handler/service.py
index 5213f77b1..dc11b8b66 100644
--- a/vitrage/api_handler/service.py
+++ b/vitrage/api_handler/service.py
@@ -12,7 +12,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import eventlet
 from oslo_log import log
 import oslo_messaging
 from oslo_service import service as os_service
@@ -28,8 +27,6 @@ from vitrage import rpc as vitrage_rpc
 
 LOG = log.getLogger(__name__)
 
-eventlet.monkey_patch()
-
 
 class VitrageApiHandlerService(os_service.Service):
 
diff --git a/vitrage/rpc.py b/vitrage/rpc.py
index 5663feccd..e1f04d317 100644
--- a/vitrage/rpc.py
+++ b/vitrage/rpc.py
@@ -96,6 +96,6 @@ def get_server(target, endpoints, transport, serializer=None):
     return messaging.get_rpc_server(transport,
                                     target,
                                     endpoints,
-                                    executor='eventlet',
+                                    executor='threading',
                                     serializer=serializer,
                                     access_policy=access_policy)