diff --git a/src/ui_common.c b/src/ui_common.c
index 8dcbacf5..bf8ed899 100644
--- a/src/ui_common.c
+++ b/src/ui_common.c
@@ -84,7 +84,10 @@ void ui_init(void) {
 }
 
 void require_pin(void) {
-    os_global_pin_invalidate();
+    // before exiting the app, force a device lock
+    bolos_ux_params_t params = {.ux_id = BOLOS_UX_VALIDATE_PIN};
+    os_ux_blocking(&params);
+
 }
 
 void exit_app(void) {
diff --git a/src/ui_empty.c b/src/ui_empty.c
index 6823acfc..2de3cc35 100644
--- a/src/ui_empty.c
+++ b/src/ui_empty.c
@@ -37,6 +37,9 @@ void ux_layout_empty_screen_init(__attribute__((unused)) unsigned int x) {
 
 void return_to_idle() {
     global.is_blank_screen = false;
+    // before exiting the screensaver, force a device lock
+    bolos_ux_params_t params = {.ux_id = BOLOS_UX_VALIDATE_PIN};
+    os_ux_blocking(&params);
     ux_idle_screen(NULL, NULL);
 }