diff --git a/sql/dd/impl/upgrade/server.cc b/sql/dd/impl/upgrade/server.cc
index 59cf62bbf7a..52289dee020 100644
--- a/sql/dd/impl/upgrade/server.cc
+++ b/sql/dd/impl/upgrade/server.cc
@@ -924,7 +924,9 @@ static bool check_events(THD *thd, std::unique_ptr<Schema> &schema,
       dd::Event::DD_table::create_key_by_schema_id(schema->id()));
 
   auto process_event = [&](std::unique_ptr<dd::Event> &event) {
+    Routine_event_context_guard guard(thd);
     dd::String_type sql;
+    thd->variables.sql_mode = event->sql_mode();
     if (build_event_sp(thd, event->name().c_str(), event->name().size(),
                        event->definition().c_str(), event->definition().size(),
                        &sql) ||