diff --git a/client/internal/profilemanager/service.go b/client/internal/profilemanager/service.go
index b2a2b9984..dcdb5ab72 100644
--- a/client/internal/profilemanager/service.go
+++ b/client/internal/profilemanager/service.go
@@ -652,7 +652,7 @@ func (s *ServiceManager) ClaimLegacyProfiles(id ipcauth.Identity) {
 }
 
 func (s *ServiceManager) ClaimDefaultProfileIfNeeded(id ipcauth.Identity) {
-	if !id.Known() || ipcauth.IsPrivilegedCaller(id) {
+	if !id.Known() || ipcauth.IsPrivilegedCaller(id) || !defaultProfileClaimDisabled() {
 		return
 	}
 
@@ -672,7 +672,7 @@ func (s *ServiceManager) ClaimDefaultProfileIfNeeded(id ipcauth.Identity) {
 		}
 	}
 
-	if unowned && !defaultProfileClaimDisabled() && isConsoleUser(id) {
+	if unowned && isConsoleUser(id) {
 		principal := ipcauth.OwnerPrincipalForIdentity(id)
 		parsed, ok := ipcauth.ParsePrincipal(principal)
 		if !ok {