diff --git a/source/Lib/CommonLib/MCTS.cpp b/source/Lib/CommonLib/MCTS.cpp
index 6852d72f80dc58bd50264fee43d21f5901daf4a5..7c9b6ba6760c1b1bbbad497add57927cba89620e 100644
--- a/source/Lib/CommonLib/MCTS.cpp
+++ b/source/Lib/CommonLib/MCTS.cpp
@@ -114,7 +114,6 @@ Area MCTSHelper::getTileArea( const CodingStructure* cs, const int ctuAddr )
   return Area( tileLeftTopPelPosX, tileLeftTopPelPosY, tileRightBottomPelPosX - tileLeftTopPelPosX + 1, tileRightBottomPelPosY - tileLeftTopPelPosY + 1 );
 }
 
-#if JVET_M0445_MCTS_FIX_FOR_DMVR
 bool MCTSHelper::isRefBlockAtRestrictedTileBoundary( const PredictionUnit &pu )
 {
   const Area& tileArea = pu.cs->picture->mctsInfo.getTileArea();
@@ -139,7 +138,6 @@ bool MCTSHelper::isRefBlockAtRestrictedTileBoundary( const PredictionUnit &pu )
   }
   return false;
 }
-#endif
 
 static void getMotInfoBlockPartPos( const PredictionUnit& pu, int xOff, int yOff, const Mv& mv, int& ruiPredXLeft, int& ruiPredYTop, int& ruiPredXRight, int& ruiPredYBottom )
 {
diff --git a/source/Lib/CommonLib/MCTS.h b/source/Lib/CommonLib/MCTS.h
index f6f688cd149f6b98130fc43cf9e6a6e6479353bd..b3bc407d3364c9107ad0e3d440d2da59a361b66c 100644
--- a/source/Lib/CommonLib/MCTS.h
+++ b/source/Lib/CommonLib/MCTS.h
@@ -75,9 +75,7 @@ namespace MCTSHelper {
   Area getTileAreaRestricted         ( const Area& tileArea, const int offLT, const int offRB );
   void clipMvToArea                  ( Mv& rcMv, const struct Area& block, const struct Area& clipArea, const SPS& sps, int mvFracBits = MV_FRACTIONAL_BITS_INTERNAL );
   Area getTileArea                   ( const CodingStructure* cs, const int ctuAddr );
-#if JVET_M0445_MCTS_FIX_FOR_DMVR
   bool isRefBlockAtRestrictedTileBoundary( const PredictionUnit &pu );
-#endif
   bool checkMvForMCTSConstraint      ( const PredictionUnit &pu, const Mv& mv );
   bool checkMvBufferForMCTSConstraint( const PredictionUnit &pu, bool msgFlag = false );
 }
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index d48ffcdeb7a2e19e18460bc035a5bbe6e375e49f..3f1e7d90bfbec5345a85b59e2e24b248d821754f 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -53,7 +53,6 @@
 #define JVET_M0445_MCTS                                   1 // Motion constrained tile sets
 #if JVET_M0445_MCTS
 #define JVET_M0445_MCTS_DEC_CHECK                         1 // Check at decoder side the MCTS restrictions
-#define JVET_M0445_MCTS_FIX_FOR_DMVR                      1
 #endif
 #define JCTVC_Y0038_PARAMS                                1
 
diff --git a/source/Lib/EncoderLib/EncCu.cpp b/source/Lib/EncoderLib/EncCu.cpp
index 7186847432f348fcf58d31b9ea99b0ee73779b9d..27e9ac0cfa34326a20eb199f5aa9e4faa58f1c69 100644
--- a/source/Lib/EncoderLib/EncCu.cpp
+++ b/source/Lib/EncoderLib/EncCu.cpp
@@ -2649,12 +2649,8 @@ void EncCu::xCheckRDCostMerge2Nx2N( CodingStructure *&tempCS, CodingStructure *&
       PU::spanMotionInfo( pu, mergeCtx );
 
 #if JVET_M0445_MCTS 
-#if JVET_M0445_MCTS_FIX_FOR_DMVR
       bool isDMVR = PU::checkDMVRCondition( pu );
       if( ( isDMVR && MCTSHelper::isRefBlockAtRestrictedTileBoundary( pu ) ) || ( !isDMVR && !( MCTSHelper::checkMvBufferForMCTSConstraint( pu ) ) ) )
-#else
-      if( m_pcEncCfg->getMCTSEncConstraint() && ( !( MCTSHelper::checkMvBufferForMCTSConstraint( pu ) ) ) )
-#endif
       {
         // Do not use this mode
         tempCS->initStructData( encTestMode.qp, encTestMode.lossless );