diff --git a/sdk/src/query-native-hotpath-adapter.ts b/sdk/src/query-native-hotpath-adapter.ts
index 6a201d74b..91c93e738 100644
--- a/sdk/src/query-native-hotpath-adapter.ts
+++ b/sdk/src/query-native-hotpath-adapter.ts
@@ -19,11 +19,25 @@ export class QueryNativeHotpathAdapter {
     mode: 'json' | 'raw',
   ): Promise<unknown> {
     if (!this.shouldUseNativeQuery()) {
-      return mode === 'raw'
-        ? this.execRawFallback(legacyCommand, legacyArgs)
-        : this.execJsonFallback(legacyCommand, legacyArgs);
+      return this.dispatchFallback(legacyCommand, legacyArgs, mode);
     }
 
+    return this.dispatchNative(legacyCommand, legacyArgs, registryCommand, registryArgs, mode);
+  }
+
+  private dispatchFallback(legacyCommand: string, legacyArgs: string[], mode: 'json' | 'raw'): Promise<unknown> {
+    return mode === 'raw'
+      ? this.execRawFallback(legacyCommand, legacyArgs)
+      : this.execJsonFallback(legacyCommand, legacyArgs);
+  }
+
+  private dispatchNative(
+    legacyCommand: string,
+    legacyArgs: string[],
+    registryCommand: string,
+    registryArgs: string[],
+    mode: 'json' | 'raw',
+  ): Promise<unknown> {
     return mode === 'raw'
       ? this.nativeDirect.dispatchRaw(legacyCommand, legacyArgs, registryCommand, registryArgs)
       : this.nativeDirect.dispatchJson(legacyCommand, legacyArgs, registryCommand, registryArgs);