diff --git a/source/Lib/EncoderLib/EncGOP.cpp b/source/Lib/EncoderLib/EncGOP.cpp
index 9c4deebbdf9971d4624b0fdf483ff8a8fb61f701..277cb4b3e5195257898c461dd42868c8ad2b0bd2 100644
--- a/source/Lib/EncoderLib/EncGOP.cpp
+++ b/source/Lib/EncoderLib/EncGOP.cpp
@@ -3255,15 +3255,19 @@ void EncGOP::compressGOP( int iPOCLast, int iNumPicRcvd, PicList& rcListPic,
 #if NN_LF_FORCE_USE
         m_nnfilterUnified.forceIntraType(m_pcCfg->getNnlfDebugOption() == 2 ? true : false);
         if (m_pcCfg->getNnlfDebugOption() != 1 || pcSlice->isIntra()) // when m_nnlfOption == 1, skip NN filtering for inter slice (note m_picprm.sprm.mode = -1 by default)
+        {
 #endif
 #if JVET_AH0096_CONTENT_ADAPTIVE_LOP
-        if (m_pcCfg->getUseNnfu() && m_pcCfg->getNumNnfus() > 0 && m_newNnfu)
-        {
-          m_nnfilterUnified.init(m_pcCfg->getNnfuModelFileNames().front(), m_pcCfg->getSourceWidth(), m_pcCfg->getSourceHeight(), m_pcCfg->getChromaFormatIdc(), m_pcCfg->getNnlfUnifiedMaxNumPrms(), true, true);
-          m_pcCfg->getNnfuModelFileNames().pop_front();
+          if (m_pcCfg->getUseNnfu() && m_pcCfg->getNumNnfus() > 0 && m_newNnfu)
+          {
+            m_nnfilterUnified.init(m_pcCfg->getNnfuModelFileNames().front(), m_pcCfg->getSourceWidth(), m_pcCfg->getSourceHeight(), m_pcCfg->getChromaFormatIdc(), m_pcCfg->getNnlfUnifiedMaxNumPrms(), true, true);
+            m_pcCfg->getNnfuModelFileNames().pop_front();
+          }
+#endif
+          m_nnfilterUnified.chooseParameters(*pcPic);
+#if NN_LF_FORCE_USE
         }
 #endif
-        m_nnfilterUnified.chooseParameters(*pcPic);
         pcSlice->setNnlfUnifiedParameters(m_nnfilterUnified.getSliceprms());
       }
 #endif