diff --git a/ui-ngx/src/app/modules/home/pages/device/device-check-connectivity-dialog.component.html b/ui-ngx/src/app/modules/home/pages/device/device-check-connectivity-dialog.component.html
index 3b761e5431..9b0b18e2c2 100644
--- a/ui-ngx/src/app/modules/home/pages/device/device-check-connectivity-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/pages/device/device-check-connectivity-dialog.component.html
@@ -342,7 +342,7 @@
   <span fxFlex></span>
   <button mat-button
           [disabled]="(isLoading$ | async)"
-          (click)="close()">{{ closeButtonLabel | translate }}</button>
+          (click)="close()">{{ 'action.close' | translate }}</button>
 </div>
 <ng-template #loadingCommand>
   <div class="tb-loader">
diff --git a/ui-ngx/src/app/modules/home/pages/device/device-check-connectivity-dialog.component.ts b/ui-ngx/src/app/modules/home/pages/device/device-check-connectivity-dialog.component.ts
index 7516e0f3e1..eeb54381df 100644
--- a/ui-ngx/src/app/modules/home/pages/device/device-check-connectivity-dialog.component.ts
+++ b/ui-ngx/src/app/modules/home/pages/device/device-check-connectivity-dialog.component.ts
@@ -74,7 +74,6 @@ export class DeviceCheckConnectivityDialogComponent extends
 
   showDontShowAgain: boolean;
   dialogTitle: string;
-  closeButtonLabel: string;
 
   notShowAgain = false;
 
@@ -99,11 +98,9 @@ export class DeviceCheckConnectivityDialogComponent extends
 
     if (this.data.afterAdd) {
       this.dialogTitle = 'device.connectivity.device-created-check-connectivity';
-      this.closeButtonLabel = 'action.skip';
       this.showDontShowAgain = true;
     } else {
       this.dialogTitle = 'device.connectivity.check-connectivity';
-      this.closeButtonLabel = 'action.close';
       this.showDontShowAgain = false;
     }
   }
diff --git a/ui-ngx/src/app/modules/home/pages/device/devices-table-config.resolver.ts b/ui-ngx/src/app/modules/home/pages/device/devices-table-config.resolver.ts
index 6682e87551..71d2a5bad9 100644
--- a/ui-ngx/src/app/modules/home/pages/device/devices-table-config.resolver.ts
+++ b/ui-ngx/src/app/modules/home/pages/device/devices-table-config.resolver.ts
@@ -467,12 +467,13 @@ export class DevicesTableConfigResolver implements Resolve<EntityTableConfig<Dev
     }).afterClosed().subscribe(
       (res) => {
         if (res) {
-          this.config.updateData();
           this.store.pipe(select(selectUserSettingsProperty( 'notDisplayConnectivityAfterAddDevice'))).pipe(
             take(1)
           ).subscribe((settings: boolean) => {
             if(!settings) {
               this.checkConnectivity(null, res.id, true);
+            } else {
+              this.config.updateData();
             }
           });
         }
@@ -734,6 +735,10 @@ export class DevicesTableConfigResolver implements Resolve<EntityTableConfig<Dev
         }
       })
       .afterClosed()
-      .subscribe(() => {});
+      .subscribe(() => {
+        if (afterAdd ) {
+          this.config.updateData();
+        }
+      });
   }
 }