diff --git a/management/server/peer.go b/management/server/peer.go
index 439756eb5..00e97b044 100644
--- a/management/server/peer.go
+++ b/management/server/peer.go
@@ -406,7 +406,7 @@ func (am *DefaultAccountManager) AddPeer(setupKey, userID string, peer *nbpeer.P
 		Ephemeral:              ephemeral,
 	}
 
-	if account.Settings.Extra.PeerApprovalEnabled {
+	if account.Settings.Extra != nil && account.Settings.Extra.PeerApprovalEnabled {
 		newPeer.Status.RequiresApproval = true
 	}