diff --git a/management/server/grpcserver.go b/management/server/grpcserver.go
index 89a1e95dc..2b27f9e0f 100644
--- a/management/server/grpcserver.go
+++ b/management/server/grpcserver.go
@@ -2,7 +2,6 @@ package server
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"net"
 	"net/netip"
@@ -339,9 +338,6 @@ func mapError(ctx context.Context, err error) error {
 		default:
 		}
 	}
-	if errors.Is(err, internalStatus.ErrPeerAlreadyLoggedIn) {
-		return status.Error(codes.PermissionDenied, internalStatus.ErrPeerAlreadyLoggedIn.Error())
-	}
 	log.WithContext(ctx).Errorf("got an unhandled error: %s", err)
 	return status.Errorf(codes.Internal, "failed handling request")
 }
diff --git a/management/server/loginfilter.go b/management/server/loginfilter.go
index f28b999db..7228f3e08 100644
--- a/management/server/loginfilter.go
+++ b/management/server/loginfilter.go
@@ -47,6 +47,7 @@ func (l *loginFilter) addLogin(wgPubKey, metaHash string) {
 	}
 	mh.hashes[metaHash] = struct{}{}
 	mh.counter++
+	l.logged[wgPubKey] = mh
 	if mh.counter > loggingLimit && len(mh.hashes) > 1 {
 		log.WithFields(log.Fields{
 			"wgPubKey":                            wgPubKey,