diff --git a/include/boost/unordered/unordered_flat_map.hpp b/include/boost/unordered/unordered_flat_map.hpp
index 111847c1..449dec0e 100644
--- a/include/boost/unordered/unordered_flat_map.hpp
+++ b/include/boost/unordered/unordered_flat_map.hpp
@@ -400,7 +400,7 @@ namespace boost {
       return (lhs.size() == rhs.size()) && ([&] {
         for (auto const& kvp : lhs) {
           auto pos = rhs.find(kvp.first);
-          if (pos != rhs.end() && (pos->second != kvp.second)) {
+          if ((pos == rhs.end()) || (*pos != kvp)) {
             return false;
           }
         }
diff --git a/include/boost/unordered/unordered_flat_set.hpp b/include/boost/unordered/unordered_flat_set.hpp
index 4113ad73..6b1cbe69 100644
--- a/include/boost/unordered/unordered_flat_set.hpp
+++ b/include/boost/unordered/unordered_flat_set.hpp
@@ -292,7 +292,7 @@ namespace boost {
       return (lhs.size() == rhs.size()) && ([&] {
         for (auto const& key : lhs) {
           auto pos = rhs.find(key);
-          if (pos != rhs.end() && (key != *pos)) {
+          if ((pos == rhs.end()) || (key != *pos)) {
             return false;
           }
         }