diff --git a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceServiceImpl.java
index 55696c9e4b..d58249fef2 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceServiceImpl.java
@@ -557,7 +557,7 @@ public class DeviceServiceImpl extends CachedVersionedEntityService<DeviceCacheK
         device.setType(profile.getName());
         device.setTenantId(profile.getTenantId());
         ObjectNode additionalInfoNode = JacksonUtil.newObjectNode();
-        if (provisionRequest.getGateway()) {
+        if (provisionRequest.getGateway() != null && provisionRequest.getGateway()) {
             additionalInfoNode.put(DataConstants.GATEWAY_PARAMETER, true);
         }
         device.setAdditionalInfo(additionalInfoNode);