diff --git a/src/inet/common/packet/serializer/ChunkSerializerRegistry.cc b/src/inet/common/packet/serializer/ChunkSerializerRegistry.cc
index 806b27ab661..b0fe65ade0b 100644
--- a/src/inet/common/packet/serializer/ChunkSerializerRegistry.cc
+++ b/src/inet/common/packet/serializer/ChunkSerializerRegistry.cc
@@ -18,12 +18,12 @@ ChunkSerializerRegistry::~ChunkSerializerRegistry()
 void ChunkSerializerRegistry::registerSerializer(const std::type_info& typeInfo, const ChunkSerializer *serializer)
 {
     CHUNK_CHECK_USAGE(serializer != nullptr, "invalid serializer");
-    serializers[&typeInfo] = serializer;
+    serializers[typeInfo] = serializer;
 }
 
 const ChunkSerializer *ChunkSerializerRegistry::getSerializer(const std::type_info& typeInfo) const
 {
-    auto it = serializers.find(&typeInfo);
+    auto it = serializers.find(typeInfo);
     if (it != serializers.end())
         return it->second;
     else
diff --git a/src/inet/common/packet/serializer/ChunkSerializerRegistry.h b/src/inet/common/packet/serializer/ChunkSerializerRegistry.h
index ce8a471a0a6..fb1579b0b6d 100644
--- a/src/inet/common/packet/serializer/ChunkSerializerRegistry.h
+++ b/src/inet/common/packet/serializer/ChunkSerializerRegistry.h
@@ -8,6 +8,8 @@
 #ifndef __INET_CHUNKSERIALIZERREGISTRY_H
 #define __INET_CHUNKSERIALIZERREGISTRY_H
 
+#include <typeindex>
+
 #include "inet/common/packet/serializer/ChunkSerializer.h"
 
 namespace inet {
@@ -17,7 +19,7 @@ namespace inet {
 class INET_API ChunkSerializerRegistry
 {
   protected:
-    std::map<const std::type_info *, const ChunkSerializer *> serializers;
+    std::unordered_map<std::type_index, const ChunkSerializer *> serializers;
 
   public:
     ~ChunkSerializerRegistry();