diff --git a/lib/rbcodec/metadata/metadata.h b/lib/rbcodec/metadata/metadata.h
index 96b9d298c4..a48afee004 100644
--- a/lib/rbcodec/metadata/metadata.h
+++ b/lib/rbcodec/metadata/metadata.h
@@ -196,10 +196,11 @@ enum {
     ID3_VER_2_4
 };
 
-#define AA_FLAGS_SHIFT 4
-#define AA_CLEAR_FLAGS_MASK ~(-1 << AA_FLAGS_SHIFT)
-
 #ifdef HAVE_ALBUMART
+
+#define AA_FLAGS_SHIFT 4
+#define AA_CLEAR_FLAGS_MASK ~(-1UL << AA_FLAGS_SHIFT)
+
 enum mp3_aa_type {
     AA_TYPE_UNKNOWN,
     AA_TYPE_BMP,