diff --git a/soda/core/soda/execution/data_source.py b/soda/core/soda/execution/data_source.py
index e390daefa..56a3de622 100644
--- a/soda/core/soda/execution/data_source.py
+++ b/soda/core/soda/execution/data_source.py
@@ -1119,7 +1119,9 @@ def _create_table_prefix(self):
             return self.database
             return f'"{self.database}"."{self.schema}"'
         """
-        return self.schema
+        if self.schema:
+            return f'"{self.schema}"'
+        return None
 
     def update_schema(self, schema_name):
         self.schema = schema_name