diff --git a/buildflow/io/duckdb/duckdb.py b/buildflow/io/duckdb/duckdb.py
index 9aff3ea1..4e9ddd53 100644
--- a/buildflow/io/duckdb/duckdb.py
+++ b/buildflow/io/duckdb/duckdb.py
@@ -26,7 +26,10 @@ def __post_init__(self):
             self.database = f"{self.database}?{self.motherduck_token}"
 
     def primitive_id(self):
-        return f"{self.database}:{self.table}"
+        db = self.database
+        if "?" in self.database:
+            db = self.database.split("?")[0]
+        return f"{db}:{self.table}"
 
     @classmethod
     def from_local_options(