diff --git a/src/runtime/setup.rs b/src/runtime/setup.rs
index ab12b429d02be2e6aa815d43612319c5744d0efe..6822e4b907b0cbdb2719e028e334fa5ceaef360b 100644
--- a/src/runtime/setup.rs
+++ b/src/runtime/setup.rs
@@ -87,7 +87,9 @@ impl Connector {
                     native_batches: vec![Default::default()],
                     round_result: Ok(None),
                 };
-                session_optimize(cu, &mut comm, deadline)?;
+                if cfg!(feature = "session_optimization") {
+                    session_optimize(cu, &mut comm, deadline)?;
+                }
                 log!(cu.logger, "connect() finished. setup phase complete");
                 self.phased = ConnectorPhased::Communication(Box::new(comm));
                 Ok(())