diff --git a/server/service/devices.go b/server/service/devices.go
index 4f77e9f9cf..8c133ee20e 100644
--- a/server/service/devices.go
+++ b/server/service/devices.go
@@ -57,7 +57,7 @@ func getDeviceHostEndpoint(ctx context.Context, request interface{}, svc fleet.S
 
 	license, err := svc.License(ctx)
 	if err != nil {
-		return nil, err
+		return getDeviceHostResponse{Err: err}, nil
 	}
 
 	return getDeviceHostResponse{