diff --git a/src/SongCacheIndex.cpp b/src/SongCacheIndex.cpp
index a00fb18ee6..c791cb2b38 100644
--- a/src/SongCacheIndex.cpp
+++ b/src/SongCacheIndex.cpp
@@ -539,7 +539,7 @@ void SongCacheIndex::CreateDBTables()
 		"TIMINGDATAID INTEGER, DISPLAYBPMMIN FLOAT, DISPLAYBPMMAX FLOAT, STEPFILENAME TEXT, SONGID INTEGER, "
 		"CONSTRAINT fk_songid FOREIGN KEY (SONGID) REFERENCES songs(ID), "
 		"CONSTRAINT fk_timingdataid FOREIGN KEY (TIMINGDATAID) REFERENCES timingdatas(ID), "
-		"CONSTRAINT unique_diffandsong UNIQUE(SONGID, DIFFICULTY))");
+		"CONSTRAINT unique_diff UNIQUE(SONGID, DIFFICULTY, STEPSTYPE, CHARTNAME))");
 	db->exec("CREATE INDEX IF NOT EXISTS idx_dirs "
 		"ON songs(DIR, DIRHASH)");
 	db->exec("CREATE INDEX IF NOT EXISTS idx_timingdatas "