diff --git a/src/video_decompress/cmpto_j2k.cpp b/src/video_decompress/cmpto_j2k.cpp
index d0ed611a9..0478726e7 100644
--- a/src/video_decompress/cmpto_j2k.cpp
+++ b/src/video_decompress/cmpto_j2k.cpp
@@ -98,10 +98,6 @@ static void *decompress_j2k_worker(void *args)
                 int decoded_img_status;
                 CHECK_OK(cmpto_j2k_dec_ctx_get_decoded_img(s->decoder, 1, &img, &decoded_img_status),
 				"Decode image", continue);
-                if (img == NULL) {
-                        /// @todo what about reconfiguration
-                        break;
-                }
 
                 {
                         lock_guard<mutex> lk(s->lock);
@@ -116,6 +112,10 @@ static void *decompress_j2k_worker(void *args)
                         continue;
                 }
 
+                if (img == NULL) { // decoder stopped
+                        break;
+                }
+
                 void *dec_data;
                 size_t len;
                 CHECK_OK(cmpto_j2k_dec_img_get_samples(img, &dec_data, &len),