diff --git a/dbtmetabase/metabase.py b/dbtmetabase/metabase.py
index 1a875939..d4a0a1cd 100644
--- a/dbtmetabase/metabase.py
+++ b/dbtmetabase/metabase.py
@@ -238,7 +238,8 @@ def build_metadata_lookups(self, database_id: str, schema: str) -> (dict, dict):
 
         metadata = self.api('get', f'/api/database/{database_id}/metadata')
         for table in metadata.get('tables', []):
-            if table['schema'].upper() != schema.upper():
+            table_schema = 'public' if table['schema'] is None else table['schema']
+            if table_schema.upper() != schema.upper():
                 continue
 
             table_name = table['name'].upper()