diff --git a/.github/workflows/odbc-cdmc-spark.yaml b/.github/workflows/odbc-cdmc-spark.yaml
index 3b21d4de..1ea6b860 100644
--- a/.github/workflows/odbc-cdmc-spark.yaml
+++ b/.github/workflows/odbc-cdmc-spark.yaml
@@ -91,7 +91,8 @@ jobs:
               httpPath = Sys.getenv("HTTP_PATH"),
               workspace = Sys.getenv("WORKSPACE"),
               uid = Sys.getenv("USER"),
-              pwd = Sys.getenv("PASSWORD")            
+              pwd = Sys.getenv("PASSWORD"),
+              useNativeQuery = FALSE
             ),
             file = "./args.rds"
           )
diff --git a/R/CDMInterface.R b/R/CDMInterface.R
index d2b70de8..088c62d6 100644
--- a/R/CDMInterface.R
+++ b/R/CDMInterface.R
@@ -111,7 +111,9 @@ fetchCohortTable <- function(cdm, cohorts, cohortTableName, andromeda, andromeda
     }
   }
 
-  cdm <- CDMConnector::dropSourceTable(cdm = cdm, name = "tp_temp_tbl")
+  if ("tp_temp_tbl" %in% CDMConnector::listSourceTables(cdm)) {
+    cdm <- CDMConnector::dropSourceTable(cdm = cdm, name = "tp_temp_tbl")
+  }
 
   andromeda[[andromedaTableName]] <- andromeda[[andromedaTableName]] %>%
     dplyr::mutate(r = dplyr::row_number()) %>%