diff --git a/apps/plugins/imageviewer/jpeg/jpeg_decoder.c b/apps/plugins/imageviewer/jpeg/jpeg_decoder.c
index ef7d5ddb3d..e262a50971 100644
--- a/apps/plugins/imageviewer/jpeg/jpeg_decoder.c
+++ b/apps/plugins/imageviewer/jpeg/jpeg_decoder.c
@@ -1081,6 +1081,11 @@ static const int extend_test[16] =   /* entry n is 2**(n-1) */
     0x0100, 0x0200, 0x0400, 0x0800, 0x1000, 0x2000, 0x4000
 };
 
+#if (__GNUC__ >= 6)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshift-negative-value"
+#endif
+
 static const int extend_offset[16] = /* entry n is (-1 << n) + 1 */
 {
     0, ((-1)<<1) + 1, ((-1)<<2) + 1, ((-1)<<3) + 1, ((-1)<<4) + 1,
@@ -1088,6 +1093,9 @@ static const int extend_offset[16] = /* entry n is (-1 << n) + 1 */
     ((-1)<<9) + 1, ((-1)<<10) + 1, ((-1)<<11) + 1, ((-1)<<12) + 1,
     ((-1)<<13) + 1, ((-1)<<14) + 1, ((-1)<<15) + 1
 };
+#if (__GNUC__ >= 6)
+#pragma GCC diagnostic pop
+#endif
 
 /* Decode a single value */
 INLINE int huff_decode_dc(struct bitstream* bs, struct derived_tbl* tbl)
diff --git a/apps/plugins/imageviewer/jpegp/jpeg81.c b/apps/plugins/imageviewer/jpegp/jpeg81.c
index 76b36ca950..83f4e287fa 100644
--- a/apps/plugins/imageviewer/jpegp/jpeg81.c
+++ b/apps/plugins/imageviewer/jpegp/jpeg81.c
@@ -46,6 +46,10 @@ jpeg81.c
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-parameter"
+#if (__GNUC__ >= 6)
+#pragma GCC diagnostic ignored "-Wshift-negative-value"
+#endif
+
 ///////////////////////////////////////// LOSSLESS /////////////////////////////////////////
 
 static int P1(struct COMP *C, TSAMP *samp)	// Px = Ra
diff --git a/apps/recorder/jpeg_load.c b/apps/recorder/jpeg_load.c
index 815423bb1d..c9c6982b4d 100644
--- a/apps/recorder/jpeg_load.c
+++ b/apps/recorder/jpeg_load.c
@@ -43,6 +43,11 @@
 #define JDEBUGF(...)
 #endif
 
+#if (__GNUC__ >= 6)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshift-negative-value"
+#endif
+
 /**************** begin JPEG code ********************/
 
 #ifdef HAVE_LCD_COLOR