diff --git a/src/app/settings/preferences.component.ts b/src/app/settings/preferences.component.ts
index 8c48105a..6a98e7a9 100644
--- a/src/app/settings/preferences.component.ts
+++ b/src/app/settings/preferences.component.ts
@@ -23,7 +23,6 @@ export class PreferencesComponent implements OnInit {
   vaultTimeouts: { name: string; value: number }[];
   localeOptions: any[];
   themeOptions: any[];
-  static MIN_CUSTOM_MINUTES = 1;
 
   vaultTimeout: FormControl = new FormControl(null);
 
@@ -83,7 +82,7 @@ export class PreferencesComponent implements OnInit {
   }
 
   async submit() {
-    if (this.vaultTimeout.value < PreferencesComponent.MIN_CUSTOM_MINUTES) {
+    if (this.vaultTimeout.errors?.minTimeoutError) {
       this.platformUtilsService.showToast(
         "error",
         null,
diff --git a/src/app/settings/vault-timeout-input.component.html b/src/app/settings/vault-timeout-input.component.html
index b61ce0cf..b11d8d05 100644
--- a/src/app/settings/vault-timeout-input.component.html
+++ b/src/app/settings/vault-timeout-input.component.html
@@ -42,7 +42,7 @@
       </div>
     </div>
 
-    <small *ngIf="!validMinutes" class="form-text text-danger">
+    <small *ngIf="!getValidMinutesInput()" class="form-text text-danger">
       <i class="bwi bwi-error" aria-hidden="true"></i> {{ "vaultCustomTimeoutMinimum" | i18n }}
     </small>
   </div>
diff --git a/src/app/settings/vault-timeout-input.component.ts b/src/app/settings/vault-timeout-input.component.ts
index 8eb308b4..2c558767 100644
--- a/src/app/settings/vault-timeout-input.component.ts
+++ b/src/app/settings/vault-timeout-input.component.ts
@@ -19,4 +19,9 @@ import { VaultTimeoutInputComponent as VaultTimeoutInputComponentBase } from "js
     },
   ],
 })
-export class VaultTimeoutInputComponent extends VaultTimeoutInputComponentBase {}
+export class VaultTimeoutInputComponent extends VaultTimeoutInputComponentBase {
+  //checks if input minutes is valid
+  getValidMinutesInput(): boolean {
+    return this.form.get("custom.minutes")?.value > 0;
+  }
+}