diff --git a/dumux/geomechanics/el1p2c/el1p2cpropertydefaults.hh b/dumux/geomechanics/el1p2c/el1p2cpropertydefaults.hh
index 2079aec02a4af3cbd5fef2cfa0d3b34af2255e6c..94d1b4c46eb1413248ab60b10e644ef3292aa000 100644
--- a/dumux/geomechanics/el1p2c/el1p2cpropertydefaults.hh
+++ b/dumux/geomechanics/el1p2c/el1p2cpropertydefaults.hh
@@ -42,6 +42,7 @@
 #include "el1p2cvolumevariables.hh"
 #include "el1p2cindices.hh"
 #include <dumux/material/fluidmatrixinteractions/diffusivitymillingtonquirk.hh>
+#include <dumux/material/fluidstates/compositionalfluidstate.hh>
 
 
 namespace Dumux
@@ -93,6 +94,14 @@ SET_TYPE_PROP(BoxElasticOnePTwoC, Indices, ElOnePTwoCIndices<TypeTag>);
 //! Set the phaseIndex per default to zero (important for two-phase fluidsystems).
 SET_INT_PROP(BoxElasticOnePTwoC, PhaseIdx, 0);
 
+SET_PROP(BoxElasticOnePTwoC, FluidState){
+    private:
+        typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+        typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+    public:
+        typedef Dumux::CompositionalFluidState<Scalar, FluidSystem> type;
+};
+
 //! set default upwind weights to 1.0, i.e. fully upwind
 SET_SCALAR_PROP(BoxElasticOnePTwoC, ImplicitMassUpwindWeight, 1.0);
 SET_SCALAR_PROP(BoxElasticOnePTwoC, ImplicitMobilityUpwindWeight, 1.0);
diff --git a/dumux/implicit/1p2c/1p2cpropertydefaults.hh b/dumux/implicit/1p2c/1p2cpropertydefaults.hh
index 38bf6fa731890925bbf380ff1a8e85908134eec6..6eee873a01b5bff2a3a1c36c7007b55efa770d90 100644
--- a/dumux/implicit/1p2c/1p2cpropertydefaults.hh
+++ b/dumux/implicit/1p2c/1p2cpropertydefaults.hh
@@ -40,6 +40,7 @@
 #include <dumux/material/spatialparams/implicitspatialparams1p.hh>
 #include <dumux/material/fluidmatrixinteractions/diffusivitymillingtonquirk.hh>
 #include <dumux/material/fluidmatrixinteractions/1p/thermalconductivityaverage.hh>
+#include <dumux/material/fluidstates/compositionalfluidstate.hh>
 
 namespace Dumux
 {
diff --git a/dumux/implicit/1p2c/1p2cvolumevariables.hh b/dumux/implicit/1p2c/1p2cvolumevariables.hh
index 807475142b858681fbb9bf32815bf638f6893af6..233b182860c8c6796aafc4ff00aecc62f29e376c 100644
--- a/dumux/implicit/1p2c/1p2cvolumevariables.hh
+++ b/dumux/implicit/1p2c/1p2cvolumevariables.hh
@@ -25,7 +25,6 @@
 #define DUMUX_1P2C_VOLUME_VARIABLES_HH
 
 #include <dumux/implicit/common/implicitvolumevariables.hh>
-#include <dumux/material/fluidstates/compositionalfluidstate.hh>
 
 #include "1p2cproperties.hh"