diff --git a/libavcodec/jpegls.c b/libavcodec/jpegls.c
index 7b4bc30e46..ab80763681 100644
--- a/libavcodec/jpegls.c
+++ b/libavcodec/jpegls.c
@@ -49,6 +49,10 @@ void ff_jpegls_init_state(JLSState *state)
         state->A[i] = FFMAX(state->range + 32 >> 6, 2);
         state->N[i] = 1;
     }
+
+    memset(state->B, 0, sizeof(state->B));
+    memset(state->C, 0, sizeof(state->C));
+    memset(state->run_index, 0, sizeof(state->run_index));
 }
 
 /**
diff --git a/libavcodec/jpeglsdec.c b/libavcodec/jpeglsdec.c
index d481221f2b..8f10f5a985 100644
--- a/libavcodec/jpeglsdec.c
+++ b/libavcodec/jpeglsdec.c
@@ -376,7 +376,6 @@ int ff_jpegls_decode_picture(MJpegDecodeContext *s)
     cur  = s->picture_ptr->data[0];
 
     /* initialize JPEG-LS state from JPEG parameters */
-    memset(state, 0, sizeof(*state));
     state->near   = near;
     state->bpp    = (s->bits < 2) ? 2 : s->bits;
     state->maxval = s->maxval;