diff --git a/gnukebox/scrobble-utils.php b/gnukebox/scrobble-utils.php
index 29adf76c21b8aa46ac9f1208c74e82c9e8b05d48..78dd3e34a4b033e9564a304be61f94ad240740fb 100644
--- a/gnukebox/scrobble-utils.php
+++ b/gnukebox/scrobble-utils.php
@@ -131,10 +131,7 @@ function getTrackCreateIfNew($artist, $album, $track, $mbid) {
 function getScrobbleTrackCreateIfNew($artist, $album, $track, $mbid, $tid) {
 	global $mdb2;
 
-	if($album) { $album = strtolower($album); }
-	if($mbid) { $mbid = strtolower($mbid); }
-
-	$res = $mdb2->query("SELECT id FROM Scrobble_Track WHERE name = " . (strtolower($track)) . " AND artist = " . (strtolower($artist)) . " AND album = " . ($album) . " AND mbid = " . ($mbid));
+	$res = $mdb2->query("SELECT id FROM Scrobble_Track WHERE name = " . (strtolower($track)) . " AND artist = " . (strtolower($artist)) . " AND album " . ($album == 'NULL') ? "IS NULL" : ("= " . (strtolower($album))) . " AND mbid " . ($mbid == 'NULL') ? "IS NULL" : ("= " . (strtolower($mbid))));
 	if(PEAR::isError($res)) {
 		die("FAILED " . $res->getMessage() . "\n");
 	}