diff --git a/application/src/main/java/org/thingsboard/server/controller/DeviceController.java b/application/src/main/java/org/thingsboard/server/controller/DeviceController.java
index 39d67ecb9c..f497c4fefa 100644
--- a/application/src/main/java/org/thingsboard/server/controller/DeviceController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/DeviceController.java
@@ -418,11 +418,7 @@ public class DeviceController extends BaseController {
                             deferredResult.setResult(new ResponseEntity<>(result, status));
                         } else {
                             status = HttpStatus.BAD_REQUEST;
-                            if (result.getResponse().equals(ClaimResponse.FAILURE)) {
-                                deferredResult.setResult(new ResponseEntity<>(result.getResponse(), status));
-                            } else {
-                                deferredResult.setResult(new ResponseEntity<>(result, status));
-                            }
+                            deferredResult.setResult(new ResponseEntity<>(result.getResponse(), status));
                         }
                     } else {
                         deferredResult.setResult(new ResponseEntity<>(HttpStatus.BAD_REQUEST));
diff --git a/dao/src/main/java/org/thingsboard/server/dao/device/ClaimDevicesServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/device/ClaimDevicesServiceImpl.java
index 9c6e754bdd..9000c91823 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/device/ClaimDevicesServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/device/ClaimDevicesServiceImpl.java
@@ -116,7 +116,7 @@ public class ClaimDevicesServiceImpl implements ClaimDevicesService {
             }
         } else {
             log.warn("Failed to find the device's claiming message![{}]", device.getName());
-            if(device.getCustomerId().getId().equals(ModelConstants.NULL_UUID)) {
+            if (device.getCustomerId().getId().equals(ModelConstants.NULL_UUID)) {
                 return Futures.immediateFuture(new ClaimResult(null, ClaimResponse.FAILURE));
             } else {
                 return Futures.immediateFuture(new ClaimResult(null, ClaimResponse.CLAIMED));