diff --git a/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereResourceImpl.java b/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereResourceImpl.java
index eb868a4ba68..fbfc06a1850 100644
--- a/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereResourceImpl.java
+++ b/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereResourceImpl.java
@@ -938,8 +938,13 @@ public boolean equals(Object o) {
 
         AtmosphereResourceImpl that = (AtmosphereResourceImpl) o;
 
-        if (!uuid.equals(that.uuid)) return false;
+        if (uuid != null ? !uuid.equals(that.uuid) : that.uuid != null) return false;
 
         return true;
     }
+
+    @Override
+    public int hashCode() {
+        return uuid != null ? uuid.hashCode() : 0;
+    }
 }
diff --git a/modules/cpr/src/test/java/org/atmosphere/cpr/AtmosphereResourceTest.java b/modules/cpr/src/test/java/org/atmosphere/cpr/AtmosphereResourceTest.java
index c495af23b06..9dce674bc41 100644
--- a/modules/cpr/src/test/java/org/atmosphere/cpr/AtmosphereResourceTest.java
+++ b/modules/cpr/src/test/java/org/atmosphere/cpr/AtmosphereResourceTest.java
@@ -24,15 +24,14 @@
 import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
 import java.io.IOException;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicReference;
 
 import static org.atmosphere.cpr.ApplicationConfig.SUSPENDED_ATMOSPHERE_RESOURCE_UUID;
 import static org.mockito.Mockito.mock;
 import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
 
 public class AtmosphereResourceTest {
     private AtmosphereFramework framework;
@@ -175,4 +174,35 @@ public void run() {
 
     }
 
+    @Test
+    public void testHashCode(){
+        String uuid = UUID.randomUUID().toString();
+
+        AtmosphereRequest request = AtmosphereRequest.newInstance();
+        request.setAttribute(ApplicationConfig.SUSPENDED_ATMOSPHERE_RESOURCE_UUID,uuid);
+        AtmosphereResponse response = AtmosphereResponse.newInstance(request);
+
+        AtmosphereResourceImpl res0 = new AtmosphereResourceImpl();
+        res0.initialize(framework.getAtmosphereConfig(),
+                        framework.getBroadcasterFactory().get(),
+                        request, response, null, null);
+
+        AtmosphereResourceImpl res1 = new AtmosphereResourceImpl();
+        res1.initialize(framework.getAtmosphereConfig(),
+                        framework.getBroadcasterFactory().get(),
+                        request, response, null, null);
+
+        assertEquals(res0,res1);
+
+        HashSet set = new HashSet();
+        set.add(res0);
+        set.add(res1);
+
+        assertEquals(set.size(),1);
+        assertTrue(set.contains(res0));
+        assertTrue(set.contains(res1));
+        assertEquals(res0,set.iterator().next());
+        assertEquals(res1,set.iterator().next());
+    }
+
 }