diff --git a/conanfile.py b/conanfile.py
index 3d6730a..014c1f8 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -10,7 +10,7 @@
 
 class NuRaftMesgConan(ConanFile):
     name = "nuraft_mesg"
-    version = "3.5.10"
+    version = "3.5.11"
 
     homepage = "https://github.com/eBay/nuraft_mesg"
     description = "A gRPC service for NuRAFT"
diff --git a/src/lib/manager_impl.cpp b/src/lib/manager_impl.cpp
index fe102d2..3bf8e80 100644
--- a/src/lib/manager_impl.cpp
+++ b/src/lib/manager_impl.cpp
@@ -51,8 +51,10 @@ class engine_factory : public group_factory {
 
 ManagerImpl::~ManagerImpl() {
     if (_mesg_service) {
-        _grpc_server->shutdown();
+        // IMPORTANT: The order matters. nuraft can be using the grpc server that might crash the system if grpc server
+        // is shutdown first.
         _mesg_service->shutdown();
+        _grpc_server->shutdown();
     }
 }