diff --git a/akka-core/src/main/scala/actor/ActorRegistry.scala b/akka-core/src/main/scala/actor/ActorRegistry.scala
index 509750340e..c08ab96b0e 100644
--- a/akka-core/src/main/scala/actor/ActorRegistry.scala
+++ b/akka-core/src/main/scala/actor/ActorRegistry.scala
@@ -75,7 +75,7 @@ object ActorRegistry extends Logging {
 
   def unregister(actor: Actor) = synchronized {
     actorsByClassName - actor.getClass.getName
-    actorsById - actor.getClass.getName
+    actorsById - actor.getId
   }
 
   def shutdownAll = {