diff --git a/sql/server_component/mysql_command_services_imp.cc b/sql/server_component/mysql_command_services_imp.cc
index 23c87b9ed09..64ab5404e52 100644
--- a/sql/server_component/mysql_command_services_imp.cc
+++ b/sql/server_component/mysql_command_services_imp.cc
@@ -643,6 +643,8 @@ DEFINE_BOOL_METHOD(mysql_command_services_imp::set,
             mysql_session = service->open(nullptr, nullptr);
           else
             return true;
+          if (mysql_session == nullptr)
+            return true;
           thd = mysql_session->get_thd();
           mcs_ext->is_thd_associated = false;
           Security_context_handle sc;