diff --git a/common/src/main/java/io/netty/util/DefaultAttributeMap.java b/common/src/main/java/io/netty/util/DefaultAttributeMap.java
index 2cd6d4a9e9..f136e232e5 100644
--- a/common/src/main/java/io/netty/util/DefaultAttributeMap.java
+++ b/common/src/main/java/io/netty/util/DefaultAttributeMap.java
@@ -172,6 +172,11 @@ public class DefaultAttributeMap implements AttributeMap {
                     if (next != null) {
                         next.prev = prev;
                     }
+
+                    // Null out prev and next - this will guard against multiple remove0() calls which may corrupt
+                    // the linked list for the bucket.
+                    prev = null;
+                    next = null;
                 }
             }
         }