diff --git a/src/frontend/src/instance.rs b/src/frontend/src/instance.rs
index 68fc207e05..35f8697d4b 100644
--- a/src/frontend/src/instance.rs
+++ b/src/frontend/src/instance.rs
@@ -155,7 +155,8 @@ impl Instance {
             query_engine.clone(),
             dist_instance.clone(),
         ));
-        plugins.insert::<Option<StatementExecutorRef>>(Some(statement_executor.clone()));
+
+        plugins.insert::<StatementExecutorRef>(statement_executor.clone());
 
         Ok(Instance {
             catalog_manager,
diff --git a/src/frontend/src/server.rs b/src/frontend/src/server.rs
index 5f23431410..6d71d42c1e 100644
--- a/src/frontend/src/server.rs
+++ b/src/frontend/src/server.rs
@@ -181,9 +181,8 @@ impl Services {
             http_server_builder.with_metrics_handler(MetricsHandler);
             http_server_builder.with_script_handler(instance.clone());
 
-            if let Some(configurator) = plugins.get::<Option<ConfiguratorRef>>() {
-                http_server_builder.with_configurator(configurator);
-            }
+            http_server_builder.with_configurator(plugins.get::<ConfiguratorRef>());
+
             let http_server = http_server_builder.build();
             result.push((Box::new(http_server), http_addr));
         }