diff --git a/Blacklight/ReleaseExtra.php b/Blacklight/ReleaseExtra.php
index 5a484cda4..dcd55202d 100755
--- a/Blacklight/ReleaseExtra.php
+++ b/Blacklight/ReleaseExtra.php
@@ -256,11 +256,9 @@ class ReleaseExtra
                     }
 
                     if ($type === 'General') {
-                        if (isset($track['UniqueID'])) {
-                            $uniqueId = $track['UniqueID'];
-                            if (! empty($uniqueId)) {
-                                $this->addUID($releaseID, $uniqueId);
-                            }
+                        if (isset($track['UniqueID']) && preg_match('/\(0x(?P<hash>[0-9a-f]{32})\)/i', $track['UniqueID'], $matches)) {
+                            $uniqueId = $matches['hash'];
+                            $this->addUID($releaseID, $uniqueId);
                         }
 
                         if (isset($track['Format'])) {
diff --git a/Changelog b/Changelog
index 4e2b4b7ae..d4fce3b9b 100755
--- a/Changelog
+++ b/Changelog
@@ -1,5 +1,6 @@
 2018-08-14 DariusIII
-	* Chg: Remove unused makeCodecPretty class, change some of the functions from public to private and change their reurn types
+	* Fix: Fix UniqueID matching for MediaInfo v18
+	* Chg: Remove unused makeCodecPretty class, change some of the functions from public to private and change their return types
 	* Chg: Update ReleaseExtra class, add MediaInfo 18 support
 2018-08-13 DariusIII
 	* Chg: Update spatie/laravel-permission to version 2.14.0