diff --git a/Compiler/NFFrontEnd/NFUnitCheck.mo b/Compiler/NFFrontEnd/NFUnitCheck.mo
index e9e3e3df3a..d01d348d77 100644
--- a/Compiler/NFFrontEnd/NFUnitCheck.mo
+++ b/Compiler/NFFrontEnd/NFUnitCheck.mo
@@ -53,7 +53,7 @@ protected
   NFHashTableStringToUnit.HashTable HtS2U;
   NFHashTableUnitToString.HashTable HtU2S;
 algorithm
-  if not (Flags.isSet(Flags.NF_UNITCHECK) or Flags.isSet(Flags.OLD_FE_UNITCHECK)) then
+  if not (Flags.isSet(Flags.NF_UNITCHECK) or Flags.isSet(Flags.OLD_FE_UNITCHECK) or (Flags.getConfigBool(Flags.CHECK_MODEL) and Flags.isSet(Flags.SCODE_INST))) then
     return;
   end if;
   try