diff --git a/opm/models/blackoil/blackoilextensivequantities.hh b/opm/models/blackoil/blackoilextensivequantities.hh
index 837bec212a..2e016f1bbf 100644
--- a/opm/models/blackoil/blackoilextensivequantities.hh
+++ b/opm/models/blackoil/blackoilextensivequantities.hh
@@ -55,7 +55,7 @@ class BlackOilExtensiveQuantities
     , public BlackOilPolymerExtensiveQuantities<TypeTag, getPropValue<TypeTag, Properties::EnablePolymer>()>
     , public BlackOilEnergyExtensiveQuantities<TypeTag, getPropValue<TypeTag, Properties::EnableEnergy>()>
     , public BlackOilDiffusionExtensiveQuantities<TypeTag, getPropValue<TypeTag, Properties::EnableDiffusion>()>
-    , public BlackOilMICPExtensiveQuantities<TypeTag>
+    , public BlackOilMICPExtensiveQuantities<TypeTag, getPropValue<TypeTag, Properties::EnableMICP>()>
 {
     using MultiPhaseParent = MultiPhaseBaseExtensiveQuantities<TypeTag>;
 
diff --git a/opm/models/blackoil/blackoilmicpmodules.hh b/opm/models/blackoil/blackoilmicpmodules.hh
index 3323328190..6f4385f43b 100644
--- a/opm/models/blackoil/blackoilmicpmodules.hh
+++ b/opm/models/blackoil/blackoilmicpmodules.hh
@@ -518,6 +518,9 @@ public:
     { throw std::logic_error("permFactor() called but MICP is disabled"); }
 };
 
+template <class TypeTag, bool enableMICPV>
+class BlackOilMICPExtensiveQuantities;
+
 /*!
  * \ingroup BlackOil
  * \class Opm::BlackOilMICPExtensiveQuantities
@@ -525,8 +528,8 @@ public:
  * \brief Provides the MICP specific extensive quantities to the generic black-oil
  *        module's extensive quantities.
  */
-template <class TypeTag, bool enableMICPV = getPropValue<TypeTag, Properties::EnableMICP>()>
-class BlackOilMICPExtensiveQuantities
+template <class TypeTag>
+class BlackOilMICPExtensiveQuantities<TypeTag, /*enableMICPV=*/true>
 {
     using Implementation = GetPropType<TypeTag, Properties::ExtensiveQuantities>;
 };