diff --git a/lib/pages/pinpad_views/lock_screen_view.dart b/lib/pages/pinpad_views/lock_screen_view.dart
index ed20c12b7..a2b61c404 100644
--- a/lib/pages/pinpad_views/lock_screen_view.dart
+++ b/lib/pages/pinpad_views/lock_screen_view.dart
@@ -223,7 +223,7 @@ class _LockscreenViewState extends ConsumerState<LockscreenView> {
     final storedPin = await _secureStore.read(key: 'stack_pin');
     final autoPin = ref.read(prefsChangeNotifierProvider).autoPin;
 
-    if (autoPin && enteredPin == storedPin) {
+    if (enteredPin.length >= 4 && autoPin && enteredPin == storedPin) {
       await Future<void>.delayed(
         const Duration(milliseconds: 200),
       );
diff --git a/lib/pages/settings_views/global_settings_view/security_views/change_pin_view/change_pin_view.dart b/lib/pages/settings_views/global_settings_view/security_views/change_pin_view/change_pin_view.dart
index bc1eb6fae..4c4bfa66c 100644
--- a/lib/pages/settings_views/global_settings_view/security_views/change_pin_view/change_pin_view.dart
+++ b/lib/pages/settings_views/global_settings_view/security_views/change_pin_view/change_pin_view.dart
@@ -86,7 +86,7 @@ class _ChangePinViewState extends ConsumerState<ChangePinView> {
     final storedPin = await _secureStore.read(key: 'stack_pin');
     final autoPin = ref.read(prefsChangeNotifierProvider).autoPin;
 
-    if (autoPin && enteredPin == storedPin) {
+    if (enteredPin.length >= 4 && autoPin && enteredPin == storedPin) {
       await _pageController.nextPage(
         duration: const Duration(milliseconds: 300),
         curve: Curves.linear,