diff --git a/app/src/ui_stream.c b/app/src/ui_stream.c
index c9b2e823c..46b42193e 100644
--- a/app/src/ui_stream.c
+++ b/app/src/ui_stream.c
@@ -49,11 +49,12 @@ tz_ui_stream_init(void (*cb)(uint8_t))
 
     FUNC_ENTER(("cb=%p", cb));
     memset(s, 0x0, sizeof(*s));
-    s->cb      = cb;
-    s->full    = false;
-    s->current = 0;
-    s->total   = -1;
-    s->last    = 0;
+    s->cb            = cb;
+    s->full          = false;
+    s->current       = 0;
+    s->pressed_right = false;
+    s->total         = -1;
+    s->last          = 0;
 
     ui_strings_init();
 
diff --git a/app/src/ui_stream_nbgl.c b/app/src/ui_stream_nbgl.c
index fc3f65c9a..6df9397d5 100644
--- a/app/src/ui_stream_nbgl.c
+++ b/app/src/ui_stream_nbgl.c
@@ -270,11 +270,12 @@ tz_ui_stream_init(void (*cb)(uint8_t))
 
     FUNC_ENTER(("cb=%p", cb));
     memset(s, 0x0, sizeof(*s));
-    s->cb      = cb;
-    s->full    = false;
-    s->last    = 0;
-    s->current = -1;
-    s->total   = -1;
+    s->cb            = cb;
+    s->full          = false;
+    s->last          = 0;
+    s->current       = -1;
+    s->total         = -1;
+    s->pressed_right = false;
 
     ui_strings_init();
 
@@ -344,9 +345,6 @@ tz_ui_nav_cb(uint8_t page, nbgl_pageContent_t *content)
         s->pressed_right, s->current, s->total, s->full, global.step);
 
     if (global.step == ST_ERROR) {
-        // TODO: this is handled by change_screen_right except we disable it
-        // to use it here. We should make ui_stream fully compatible with
-        // exception.h
         global.step = ST_IDLE;
         ui_home_init();
         result = false;