diff --git a/src/mgr/MgrClient.cc b/src/mgr/MgrClient.cc
index 2f558c0614adb..45d2707af25d2 100644
--- a/src/mgr/MgrClient.cc
+++ b/src/mgr/MgrClient.cc
@@ -59,7 +59,10 @@ void MgrClient::shutdown()
   command_table.clear();
 
   timer.shutdown();
-  session.reset();
+  if (session) {
+    session->con->mark_down();
+    session.reset();
+  }
 }
 
 bool MgrClient::ms_dispatch(Message *m)
diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 4397b8dad0fb3..b227bff0f4329 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -6655,6 +6655,9 @@ bool OSD::ms_get_authorizer(int dest_type, AuthAuthorizer **authorizer, bool for
 {
   dout(10) << "OSD::ms_get_authorizer type=" << ceph_entity_type_name(dest_type) << dendl;
 
+  if (is_stopping())
+    dout(10) << __func__ << " bailing, we are shutting down" << dendl;
+
   if (dest_type == CEPH_ENTITY_TYPE_MON)
     return true;