diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index 082fd4d82c16808303bb2fa40fe2a76c9d5c7424..ddf2e1a11e0dea71dcb2d9157a2cb5f161debc19 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -4854,7 +4854,8 @@ static size_t read_uncompressed_header(AV1Decoder *pbi,
 #endif  // CONFIG_EXT_TX
 
 #if CONFIG_GLOBAL_MOTION
-  read_global_motion(cm, rb);
+  if (!(frame_is_intra_only(cm) || cm->error_resilient_mode))
+    read_global_motion(cm, rb);
 #endif
 
   read_tile_info(pbi, rb);
diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index d534ebbc8663d7fa6460dd17fd2ffdcfe995b061..9017eed2c62dd0f1f25f82e3bbbee0c99b396925 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -4600,7 +4600,8 @@ static void write_uncompressed_header(AV1_COMP *cpi,
 #endif  // CONFIG_EXT_TX
 
 #if CONFIG_GLOBAL_MOTION
-  write_global_motion(cpi, wb);
+  if (!(frame_is_intra_only(cm) || cm->error_resilient_mode))
+    write_global_motion(cpi, wb);
 #endif  // CONFIG_GLOBAL_MOTION
 
   write_tile_info(cm, wb);