diff --git a/include/camera.h b/include/camera.h
index 6d25d3d..bf59fff 100644
--- a/include/camera.h
+++ b/include/camera.h
@@ -34,6 +34,7 @@ typedef struct {
     u32 *texture_buffer;
     Handle mutex;
     volatile bool finished;
+    volatile bool finished_update;
     volatile bool success;
     Handle cancel;
 
diff --git a/source/camera.c b/source/camera.c
index fd4dbed..f6fb9ba 100644
--- a/source/camera.c
+++ b/source/camera.c
@@ -276,6 +276,7 @@ void update_qr(qr_data *data)
 
             free(filename);
             free(zip_buf);
+            data->finished_update = true;
         }   
     }
 
@@ -286,13 +287,14 @@ bool init_qr(void)
     qr_data *data = calloc(1, sizeof(qr_data));
     data->capturing = false;
     data->finished = false;
+    data->finished_update = false;
     data->context = quirc_new();
     quirc_resize(data->context, 400, 240);
 
     data->camera_buffer = calloc(1, 400 * 240 * sizeof(u16));
     data->texture_buffer = calloc(1, 400 * 240 * sizeof(u32));
 
-    while (!data->finished) update_qr(data);
+    while (!data->finished_update && !data->finished) update_qr(data);
 
     return (bool)data->success;
 }