diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDP.h b/src/cpp/rtps/builtin/discovery/endpoint/EDP.h
index e105c64d5d8..04931a9c5e0 100644
--- a/src/cpp/rtps/builtin/discovery/endpoint/EDP.h
+++ b/src/cpp/rtps/builtin/discovery/endpoint/EDP.h
@@ -78,19 +78,19 @@ class EDP
     public:
 
         //! Bit index for matching failing due to different topic
-        static const uint32_t different_topic = (0x00000001 << 0u);
+        static const uint32_t different_topic = 0u;
 
         //! Bit index for matching failing due to inconsistent topic (same topic name but different characteristics)
-        static const uint32_t inconsistent_topic = (0x00000001 << 1u);
+        static const uint32_t inconsistent_topic = 1u;
 
         //! Bit index for matching failing due to incompatible QoS
-        static const uint32_t incompatible_qos = (0x00000001 << 2u);
+        static const uint32_t incompatible_qos = 2u;
 
         //! Bit index for matching failing due to inconsistent partitions
-        static const uint32_t partitions = (0x00000001 << 3u);
+        static const uint32_t partitions = 3u;
 
         //! Bit index for matching failing due to incompatible TypeInformation
-        static const uint32_t different_typeinfo = (0x00000001 << 4u);
+        static const uint32_t different_typeinfo = 4u;
     };
 
     /**