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 f06dfac9f9..2f7fe0680c 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
@@ -163,11 +163,13 @@ public class DeviceServiceImpl extends AbstractCachedEntityService<DeviceCacheKe
         return doSaveDevice(device, accessToken, true);
     }
 
+    @Transactional
     @Override
     public Device saveDevice(Device device, boolean doValidate) {
         return doSaveDevice(device, null, doValidate);
     }
 
+    @Transactional
     @Override
     public Device saveDevice(Device device) {
         return doSaveDevice(device, null, true);
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/DeviceServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/DeviceServiceTest.java
index 822f26496b..12bcac72f1 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/DeviceServiceTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/DeviceServiceTest.java
@@ -16,12 +16,15 @@
 package org.thingsboard.server.dao.service;
 
 import com.datastax.oss.driver.api.core.uuid.Uuids;
+import org.hibernate.exception.ConstraintViolationException;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.jupiter.api.Assertions;
+import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.mock.mockito.SpyBean;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.TransactionStatus;
 import org.springframework.transaction.support.DefaultTransactionDefinition;
@@ -50,14 +53,17 @@ import org.thingsboard.server.dao.device.DeviceService;
 import org.thingsboard.server.dao.exception.DataValidationException;
 import org.thingsboard.server.dao.exception.DeviceCredentialsValidationException;
 import org.thingsboard.server.dao.ota.OtaPackageService;
+import org.thingsboard.server.dao.service.validator.DeviceCredentialsDataValidator;
 import org.thingsboard.server.dao.tenant.TenantProfileService;
 
 import java.nio.ByteBuffer;
+import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.ArgumentMatchers.any;
 import static org.thingsboard.server.common.data.ota.OtaPackageType.FIRMWARE;
 import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID;
 
@@ -78,6 +84,8 @@ public class DeviceServiceTest extends AbstractServiceTest {
     TenantProfileService tenantProfileService;
     @Autowired
     private PlatformTransactionManager platformTransactionManager;
+    @SpyBean
+    private DeviceCredentialsDataValidator validator;
 
     private IdComparator<Device> idComparator = new IdComparator<>();
     private TenantId anotherTenantId;
@@ -152,6 +160,43 @@ public class DeviceServiceTest extends AbstractServiceTest {
         Assertions.assertNull(deviceByName);
     }
 
+    @Test
+    public void testShouldRollbackNotValidatedDeviceIfDeviceCredentialsValidationFailed() {
+        Mockito.reset(validator);
+        Mockito.doThrow(new DataValidationException("mock message"))
+                .when(validator).validate(any(), any());
+
+        Device device = new Device();
+        device.setTenantId(tenantId);
+        device.setName(StringUtils.randomAlphabetic(10));
+        device.setType("default");
+        assertThatThrownBy(() -> deviceService.saveDevice(device, false))
+                .isInstanceOf(DataValidationException.class)
+                .hasMessageContaining("mock message");
+
+        Device deviceByName = deviceService.findDeviceByTenantIdAndName(tenantId, device.getName());
+        Assertions.assertNull(deviceByName);
+    }
+
+    @Test
+    public void testShouldRollbackValidatedDeviceIfDeviceCredentialsValidationFailed() {
+        Mockito.reset(validator);
+        Mockito.doThrow(new DataValidationException("mock message"))
+                .when(validator).validate(any(), any());
+
+        Device device = new Device();
+        device.setTenantId(tenantId);
+        device.setName(StringUtils.randomAlphabetic(10));
+        device.setType("default");
+
+        assertThatThrownBy(() -> deviceService.saveDevice(device))
+                .isInstanceOf(DataValidationException.class)
+                .hasMessageContaining("mock message");
+
+        Device deviceByName = deviceService.findDeviceByTenantIdAndName(tenantId, device.getName());
+        Assertions.assertNull(deviceByName);
+    }
+
     @Test
     public void testCountByTenantId() {
         Assert.assertEquals(0, deviceService.countByTenantId(tenantId));