diff --git a/cid/export.py b/cid/export.py
index a81f103d..5f5f2494 100644
--- a/cid/export.py
+++ b/cid/export.py
@@ -196,7 +196,7 @@ def export_analysis(qs, athena, glue):
         if dep_cur:
             datasets[dataset_name]['dependsOn']['cur'] = True
 
-    all_databases = list(set(all_databases))
+    all_databases = list(set([d for _, d in all_views_and_databases]))
     if len(all_databases) > 1:
         logger.warning(f'CID only supports one database. Multiple used: {all_databases}') # fixme need to fix database