diff --git a/grpc-backend/database.go b/grpc-backend/database.go
index 4dbf503..9534c2b 100644
--- a/grpc-backend/database.go
+++ b/grpc-backend/database.go
@@ -97,7 +97,7 @@ func createDB(db *sql.DB) error {
     Tags TEXT DEFAULT '',
     LastPlayed INTEGER DEFAULT 0,
     Folder TEXT DEFAULT 'Unknown Folder',
-    UNIQUE (Artist, Title, MD5Hash, Difficulty)
+    UNIQUE (Artist, Title, MD5Hash, Difficulty, Folder)
 	);
 	`)
 	if err != nil {
diff --git a/grpc-backend/sqlc/schema/schema.sql b/grpc-backend/sqlc/schema/schema.sql
index 286ecad..b65056f 100644
--- a/grpc-backend/sqlc/schema/schema.sql
+++ b/grpc-backend/sqlc/schema/schema.sql
@@ -19,7 +19,7 @@ CREATE TABLE IF NOT EXISTS Beatmap (
     Tags TEXT DEFAULT '',
     LastPlayed INTEGER DEFAULT 0,
     Folder TEXT DEFAULT 'Unknown Folder',
-    UNIQUE (Artist, Title, MD5Hash, Difficulty)
+    UNIQUE (Artist, Title, MD5Hash, Difficulty, Folder)
 );
 
 CREATE INDEX IF NOT EXISTS idx_beatmap_md5hash ON Beatmap(MD5Hash);