diff --git a/source/Lib/EncoderLib/EncGOP.cpp b/source/Lib/EncoderLib/EncGOP.cpp
index a52fb7a00ca62a32deda9d67193944c69b777167..4bb132d6d12185af6f2d44396afb91a1f24efab6 100644
--- a/source/Lib/EncoderLib/EncGOP.cpp
+++ b/source/Lib/EncoderLib/EncGOP.cpp
@@ -3024,6 +3024,11 @@ void EncGOP::compressGOP(int pocLast, int numPicRcvd, PicList &rcListPic, std::l
       }
     }
 
+    if (!pcSlice->getSPS()->getUseAffine())
+    {
+      picHeader->setMaxNumAffineMergeCand(pcSlice->getSPS()->getSbTMVPEnabledFlag() && picHeader->getEnableTMVPFlag());
+    }
+
     pcSlice->scaleRefPicList( scaledRefPic, pcPic->cs->picHeader, m_pcEncLib->getApss(), picHeader->getLmcsAPS(), picHeader->getScalingListAPS(), false );
 
     // set adaptive search range for non-intra-slices