diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index b5d174015c162dc67841f6f550e62ee06e06856f..347ae35904ff9d6e1b86fafb1aabdd833015081a 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -66,7 +66,7 @@
 #define JVET_L0338_MDLM                                   1 // multi-directional LM. L0338 test5.4.1,L0340 test5.6.1
 
 #define JVET_L0090_PAIR_AVG                               1 // Add pairwise average candidates, replace HEVC combined candidates
-#define JVET_L0054_MMVD                                   0
+#define JVET_L0054_MMVD                                   1
 
 #define JVET_L0392_ALF_INIT_STATE                         1
 
diff --git a/source/Lib/EncoderLib/EncCu.cpp b/source/Lib/EncoderLib/EncCu.cpp
index 59d7debcba80b1c050693610cb3d9158ec57a8fe..f341701bfe830f1997d7fa7d7cb1311c8b35143c 100644
--- a/source/Lib/EncoderLib/EncCu.cpp
+++ b/source/Lib/EncoderLib/EncCu.cpp
@@ -1602,9 +1602,6 @@ void EncCu::xCheckRDCostMerge2Nx2N( CodingStructure *&tempCS, CodingStructure *&
       , 0
 #endif
     );
-#if JVET_L0054_MMVD
-    PU::getInterMMVDMergeCandidates(pu, mergeCtx);
-#endif
 #if JVET_L0104_NO_4x4BI_INTER_CU
     if (PU::isBipredRestriction(pu))
     {
@@ -1620,6 +1617,9 @@ void EncCu::xCheckRDCostMerge2Nx2N( CodingStructure *&tempCS, CodingStructure *&
         }
       }
     }
+#endif
+#if JVET_L0054_MMVD
+    PU::getInterMMVDMergeCandidates(pu, mergeCtx);
 #endif
   }
 #if JVET_L0054_MMVD