diff --git a/ui-ngx/src/app/modules/home/components/wizard/device-wizard-dialog.component.ts b/ui-ngx/src/app/modules/home/components/wizard/device-wizard-dialog.component.ts
index 593d32e2ff..1cba31aa24 100644
--- a/ui-ngx/src/app/modules/home/components/wizard/device-wizard-dialog.component.ts
+++ b/ui-ngx/src/app/modules/home/components/wizard/device-wizard-dialog.component.ts
@@ -39,8 +39,8 @@ import { BaseData, HasId } from '@shared/models/base-data';
 import { EntityType } from '@shared/models/entity-type.models';
 import { DeviceProfileService } from '@core/http/device-profile.service';
 import { EntityId } from '@shared/models/id/entity-id';
-import { Observable, of, Subscription } from 'rxjs';
-import { map, mergeMap, tap } from 'rxjs/operators';
+import { Observable, of, Subscription, throwError } from 'rxjs';
+import { catchError, map, mergeMap, tap } from 'rxjs/operators';
 import { DeviceService } from '@core/http/device.service';
 import { ErrorStateMatcher } from '@angular/material/core';
 import { StepperSelectionEvent } from '@angular/cdk/stepper';
@@ -335,7 +335,15 @@ export class DeviceWizardDialogComponent extends
         mergeMap(
           (deviceCredentials) => {
             const deviceCredentialsValue = {...deviceCredentials, ...this.credentialsFormGroup.value.credential};
-            return this.deviceService.saveDeviceCredentials(deviceCredentialsValue);
+            return this.deviceService.saveDeviceCredentials(deviceCredentialsValue).pipe(
+              catchError(e => {
+                return this.deviceService.deleteDevice(device.id.id).pipe(
+                  mergeMap(() => {
+                    return throwError(e);
+                  }
+                ));
+              })
+            );
           }
         ),
         map(() => true));