diff --git a/Audio/Chain/InputNode.m b/Audio/Chain/InputNode.m
index 59dbb48e4..d666548b5 100644
--- a/Audio/Chain/InputNode.m
+++ b/Audio/Chain/InputNode.m
@@ -122,8 +122,8 @@
 		if(entryProperties == nil)
 			return;
 
-		[entryInfo addEntriesFromDictionary:entryProperties];
 		[entryInfo addEntriesFromDictionary:[decoder metadata]];
+		[entryInfo addEntriesFromDictionary:entryProperties];
 
 		NSDictionary * info = [NSDictionary dictionaryWithDictionary:entryInfo];
 		
diff --git a/Playlist/PlaylistLoader.m b/Playlist/PlaylistLoader.m
index b158735ae..365a4cb71 100644
--- a/Playlist/PlaylistLoader.m
+++ b/Playlist/PlaylistLoader.m
@@ -561,8 +561,8 @@ static inline void dispatch_sync_reentrant(dispatch_queue_t queue, dispatch_bloc
 				if(entryProperties == nil)
 					return;
 
-				[entryInfo addEntriesFromDictionary:entryProperties];
 				[entryInfo addEntriesFromDictionary:[AudioMetadataReader metadataForURL:weakPe.URL]];
+				[entryInfo addEntriesFromDictionary:entryProperties];
 
 				[weakLock lock];
 				[weakArray addObject:weakPe];
@@ -641,8 +641,8 @@ static inline void dispatch_sync_reentrant(dispatch_queue_t queue, dispatch_bloc
 		if(entryProperties == nil)
 			return;
 
-		[entryInfo addEntriesFromDictionary:entryProperties];
 		[entryInfo addEntriesFromDictionary:[AudioMetadataReader metadataForURL:pe.URL]];
+		[entryInfo addEntriesFromDictionary:entryProperties];
 
 		[pe setMetadata:entryInfo];
 		[store trackUpdate:pe];