diff --git a/CHANGELOG.md b/CHANGELOG.md
index a82fcc1..90c6120 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.5.4]
+
+- Fix beacons that send BOTH manufacture data and service uuids (#41)
+
 ## [1.5.3]
 
 - Fix m5stickc init flag
diff --git a/lib/BleFingerprint/BleFingerprint.cpp b/lib/BleFingerprint/BleFingerprint.cpp
index 0935beb..0886b1f 100644
--- a/lib/BleFingerprint/BleFingerprint.cpp
+++ b/lib/BleFingerprint/BleFingerprint.cpp
@@ -72,7 +72,8 @@ void BleFingerprint::fingerprint(BLEAdvertisedDevice *advertisedDevice)
             sid = fingerprint;
         }
     }
-    else if (advertisedDevice->haveManufacturerData())
+
+    if (advertisedDevice->haveManufacturerData())
     {
         std::string strManufacturerData = advertisedDevice->getManufacturerData();
         if (strManufacturerData.length() > 2)