diff --git a/cluster/default_context.go b/cluster/default_context.go
index 3eba6f71..f8f7f9f2 100644
--- a/cluster/default_context.go
+++ b/cluster/default_context.go
@@ -159,7 +159,9 @@ func (dcc *DefaultContext) getPid(identity, kind string) *actor.PID {
 	pid, _ := dcc.cluster.PidCache.Get(identity, kind)
 	if pid == nil {
 		pid = dcc.cluster.Get(identity, kind)
-		dcc.cluster.PidCache.Set(identity, kind, pid)
+		if pid != nil {
+			dcc.cluster.PidCache.Set(identity, kind, pid)
+		}
 	}
 
 	return pid