diff --git a/flowexperimental/BlackOilIntensiveQuantitiesGlobalIndex.hpp b/flowexperimental/BlackOilIntensiveQuantitiesGlobalIndex.hpp
index 917b5f16b8..91627ab5d3 100644
--- a/flowexperimental/BlackOilIntensiveQuantitiesGlobalIndex.hpp
+++ b/flowexperimental/BlackOilIntensiveQuantitiesGlobalIndex.hpp
@@ -74,7 +74,7 @@ class BlackOilIntensiveQuantitiesGlobalIndex
     , public GetPropType<TypeTag, Properties::FluxModule>::FluxIntensiveQuantities
     , public BlackOilDiffusionIntensiveQuantities<TypeTag, getPropValue<TypeTag, Properties::EnableDiffusion>()>
     , public BlackOilSolventIntensiveQuantities<TypeTag, getPropValue<TypeTag, Properties::EnableSolvent>()>
-    , public BlackOilExtboIntensiveQuantities<TypeTag>
+    , public BlackOilExtboIntensiveQuantities<TypeTag, getPropValue<TypeTag, Properties::EnableExtbo>()>
     , public BlackOilPolymerIntensiveQuantities<TypeTag>
     , public BlackOilFoamIntensiveQuantities<TypeTag>
     , public BlackOilBrineIntensiveQuantities<TypeTag>
@@ -527,7 +527,7 @@ public:
 
 private:
     friend BlackOilSolventIntensiveQuantities<TypeTag, enableSolvent>;
-    friend BlackOilExtboIntensiveQuantities<TypeTag>;
+    friend BlackOilExtboIntensiveQuantities<TypeTag, enableExtbo>;
     friend BlackOilPolymerIntensiveQuantities<TypeTag>;
     friend BlackOilEnergyIntensiveQuantitiesGlobalIndex<TypeTag>;
     friend BlackOilFoamIntensiveQuantities<TypeTag>;
diff --git a/opm/models/blackoil/blackoilextbomodules.hh b/opm/models/blackoil/blackoilextbomodules.hh
index b612bc595e..770117dde1 100644
--- a/opm/models/blackoil/blackoilextbomodules.hh
+++ b/opm/models/blackoil/blackoilextbomodules.hh
@@ -380,6 +380,9 @@ template <class TypeTag, bool enableExtboV>
 BlackOilExtboParams<typename BlackOilExtboModule<TypeTag, enableExtboV>::Scalar>
 BlackOilExtboModule<TypeTag, enableExtboV>::params_;
 
+template <class TypeTag, bool enableExtboV>
+class BlackOilExtboIntensiveQuantities;
+
 /*!
  * \ingroup BlackOil
  * \class Opm::BlackOilExtboIntensiveQuantities
@@ -387,8 +390,8 @@ BlackOilExtboModule<TypeTag, enableExtboV>::params_;
  * \brief Provides the volumetric quantities required for the equations needed by the
  *        solvents extension of the black-oil model.
  */
-template <class TypeTag, bool enableExtboV = getPropValue<TypeTag, Properties::EnableExtbo>()>
-class BlackOilExtboIntensiveQuantities
+template <class TypeTag>
+class BlackOilExtboIntensiveQuantities<TypeTag, /*enableExtboV=*/true>
 {
     using Implementation = GetPropType<TypeTag, Properties::IntensiveQuantities>;
 
diff --git a/opm/models/blackoil/blackoilintensivequantities.hh b/opm/models/blackoil/blackoilintensivequantities.hh
index 8278475f17..5864e75cb0 100644
--- a/opm/models/blackoil/blackoilintensivequantities.hh
+++ b/opm/models/blackoil/blackoilintensivequantities.hh
@@ -75,7 +75,7 @@ class BlackOilIntensiveQuantities
     , public BlackOilDiffusionIntensiveQuantities<TypeTag, getPropValue<TypeTag, Properties::EnableDiffusion>() >
     , public BlackOilDispersionIntensiveQuantities<TypeTag, getPropValue<TypeTag, Properties::EnableDispersion>() >
     , public BlackOilSolventIntensiveQuantities<TypeTag, getPropValue<TypeTag, Properties::EnableSolvent>()>
-    , public BlackOilExtboIntensiveQuantities<TypeTag>
+    , public BlackOilExtboIntensiveQuantities<TypeTag, getPropValue<TypeTag, Properties::EnableExtbo>()>
     , public BlackOilPolymerIntensiveQuantities<TypeTag>
     , public BlackOilFoamIntensiveQuantities<TypeTag>
     , public BlackOilBrineIntensiveQuantities<TypeTag>
@@ -756,7 +756,7 @@ public:
 
 private:
     friend BlackOilSolventIntensiveQuantities<TypeTag, enableSolvent>;
-    friend BlackOilExtboIntensiveQuantities<TypeTag>;
+    friend BlackOilExtboIntensiveQuantities<TypeTag, enableExtbo>;
     friend BlackOilPolymerIntensiveQuantities<TypeTag>;
     friend BlackOilEnergyIntensiveQuantities<TypeTag>;
     friend BlackOilFoamIntensiveQuantities<TypeTag>;