diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkInjectorFactory.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkInjectorFactory.java
index ad4e31a0811f2..b30af13018b06 100644
--- a/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkInjectorFactory.java
+++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkInjectorFactory.java
@@ -214,13 +214,17 @@ public Injector create(PrestoSparkBootstrapTimer bootstrapTimer)
                 }
             }
 
+            FeaturesConfig featuresConfig = injector.getInstance(FeaturesConfig.class);
             if (sparkProcessType.equals(DRIVER) ||
-                    !injector.getInstance(FeaturesConfig.class).isInlineSqlFunctions()) {
+                    (!featuresConfig.isNativeExecutionEnabled()
+                            && !featuresConfig.isInlineSqlFunctions())) {
                 if (functionNamespaceProperties.isPresent()) {
-                    injector.getInstance(StaticFunctionNamespaceStore.class).loadFunctionNamespaceManagers(functionNamespaceProperties.get());
+                    injector.getInstance(StaticFunctionNamespaceStore.class)
+                            .loadFunctionNamespaceManagers(functionNamespaceProperties.get());
                 }
                 else {
-                    injector.getInstance(StaticFunctionNamespaceStore.class).loadFunctionNamespaceManagers();
+                    injector.getInstance(StaticFunctionNamespaceStore.class)
+                            .loadFunctionNamespaceManagers();
                 }
             }
             bootstrapTimer.endDriverModulesLoading();