diff --git a/src/monero_key.c b/src/monero_key.c
index d4937f0..2170e05 100644
--- a/src/monero_key.c
+++ b/src/monero_key.c
@@ -202,7 +202,7 @@ int monero_apdu_display_address() {
     unsigned char payment_id[8];
     unsigned char C[32];
     unsigned char D[32];
-    int error;
+    int error = 0;
 
     // fetch
     monero_io_fetch(index, 8);
@@ -240,9 +240,9 @@ int monero_apdu_display_address() {
         }
     }
 
-    ui_menu_any_pubaddr_display(0, C, D, (minor | major) ? 1 : 0,
-                                (G_monero_vstate.io_p1 == 1) ? payment_id : NULL);
-    return 0;
+    error = ui_menu_any_pubaddr_display(0, C, D, (minor | major) ? 1 : 0,
+                                        (G_monero_vstate.io_p1 == 1) ? payment_id : NULL);
+    return error;
 }
 
 /* ----------------------------------------------------------------------- */
diff --git a/src/monero_ux_nano.c b/src/monero_ux_nano.c
index 9c32a4a..b0abff4 100644
--- a/src/monero_ux_nano.c
+++ b/src/monero_ux_nano.c
@@ -653,7 +653,10 @@ void ui_menu_pubaddr_display(unsigned int value) {
     G_monero_vstate.disp_addr_mode = 0;
     G_monero_vstate.disp_addr_M = 0;
     G_monero_vstate.disp_addr_m = 0;
-    ui_menu_any_pubaddr_display(value, G_monero_vstate.A, G_monero_vstate.B, 0, NULL);
+    int error = ui_menu_any_pubaddr_display(value, G_monero_vstate.A, G_monero_vstate.B, 0, NULL);
+    if (error) {
+        app_exit();
+    }
 }
 
 static void exit(void) {