From f65f1d245f461592e82395aef81148eb582d415a Mon Sep 17 00:00:00 2001
From: Lucas Rodriguez <lucas@fleetdm.com>
Date: Fri, 14 Jun 2024 12:52:41 -0300
Subject: [PATCH] Fix merge main

---
 ee/server/service/hosts.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ee/server/service/hosts.go b/ee/server/service/hosts.go
index c4c6c0f180..e73ae027a4 100644
--- a/ee/server/service/hosts.go
+++ b/ee/server/service/hosts.go
@@ -59,7 +59,7 @@ func (svc *Service) LockHost(ctx context.Context, hostID uint) (unlockPIN string
 	// locking validations are based on the platform of the host
 	switch host.FleetPlatform() {
 	case "ios", "ipados":
-		return ctxerr.Wrap(ctx, fleet.NewInvalidArgumentError("host_id", "Can't lock iOS or iPadOS hosts. Use wipe instead."))
+		return "", ctxerr.Wrap(ctx, fleet.NewInvalidArgumentError("host_id", "Can't lock iOS or iPadOS hosts. Use wipe instead."))
 	case "darwin":
 		if err := svc.VerifyMDMAppleConfigured(ctx); err != nil {
 			if errors.Is(err, fleet.ErrMDMNotConfigured) {