diff --git a/common/src/main/java/io/netty/util/collection/IntObjectHashMap.java b/common/src/main/java/io/netty/util/collection/IntObjectHashMap.java
index 354ccec81c..4d1cdfc78f 100644
--- a/common/src/main/java/io/netty/util/collection/IntObjectHashMap.java
+++ b/common/src/main/java/io/netty/util/collection/IntObjectHashMap.java
@@ -311,7 +311,11 @@ public class IntObjectHashMap<V> implements IntObjectMap<V>, Iterable<IntObjectM
      * Returns the hashed index for the given key.
      */
     private int hashIndex(int key) {
-        return key % keys.length;
+        int hash = key % keys.length;
+        if (hash < 0) {
+            hash += keys.length;
+        }
+        return hash;
     }
 
     /**
diff --git a/common/src/test/java/io/netty/util/collection/IntObjectHashMapTest.java b/common/src/test/java/io/netty/util/collection/IntObjectHashMapTest.java
index ec291df874..0f5de5811b 100644
--- a/common/src/test/java/io/netty/util/collection/IntObjectHashMapTest.java
+++ b/common/src/test/java/io/netty/util/collection/IntObjectHashMapTest.java
@@ -116,6 +116,14 @@ public class IntObjectHashMapTest {
         }
     }
 
+    @Test
+    public void negativeKeyShouldSucceed() {
+        Value v = new Value("v");
+        map.put(-3, v);
+        assertEquals(1, map.size());
+        assertEquals(v, map.get(-3));
+    }
+
     @Test
     public void removeMissingValueShouldReturnNull() {
         assertNull(map.remove(1));