diff --git a/src/lib/util/tagmap.h b/src/lib/util/tagmap.h
index 75e215de562..a3ba8bf85b0 100644
--- a/src/lib/util/tagmap.h
+++ b/src/lib/util/tagmap.h
@@ -158,7 +158,7 @@ public:
 		for (entry_t *entry = m_table[fullhash % ARRAY_LENGTH(m_table)]; entry != NULL; entry = entry->next())
 			if (entry->fullhash() == fullhash && entry->tag() == tag)
 				return entry->object();
-		return NULL;
+		return (_ElementType)NULL;
 	}
 
 	// find by tag without checking anything but the hash