diff --git a/ui-ngx/src/app/modules/home/pages/admin/security-settings.component.html b/ui-ngx/src/app/modules/home/pages/admin/security-settings.component.html
index e246d9ef40..39db84d8c6 100644
--- a/ui-ngx/src/app/modules/home/pages/admin/security-settings.component.html
+++ b/ui-ngx/src/app/modules/home/pages/admin/security-settings.component.html
@@ -180,6 +180,7 @@
             <mat-label translate>admin.jwt.signings-key</mat-label>
             <input matInput (focus)="markAsTouched()" required formControlName="tokenSigningKey"/>
             <button type="button"
+                    style="line-height: 32px"
                     matSuffix
                     mat-button
                     (click)="generateSigningKey()"
diff --git a/ui-ngx/src/app/modules/home/pages/admin/security-settings.component.ts b/ui-ngx/src/app/modules/home/pages/admin/security-settings.component.ts
index dc7e9c05b7..628d23e78a 100644
--- a/ui-ngx/src/app/modules/home/pages/admin/security-settings.component.ts
+++ b/ui-ngx/src/app/modules/home/pages/admin/security-settings.component.ts
@@ -172,9 +172,12 @@ export class SecuritySettingsComponent extends PageComponent implements HasConfi
   }
 
   private base64Format(control: FormControl): { [key: string]: boolean } | null {
+    if (control.value === '' || control.value === 'thingsboardDefaultSigningKey') {
+      return null;
+    }
     try {
       const value = atob(control.value);
-      if (value.length < 32 && control.value !== 'thingsboardDefaultSigningKey') {
+      if (value.length < 32) {
         return {minLength: true};
       }
       return null;