diff --git a/opm/models/discretization/common/tpfalinearizer.hh b/opm/models/discretization/common/tpfalinearizer.hh
index 6b8b2ea48..ad5c0e0ec 100644
--- a/opm/models/discretization/common/tpfalinearizer.hh
+++ b/opm/models/discretization/common/tpfalinearizer.hh
@@ -357,7 +357,7 @@ private:
                     }
                     const bool nonzero_massrate = massrate != VectorBlock(0.0);
                     if (free || nonzero_massrate) {
-                        const auto& exFluidState = problem_().initialFluidState(myIdx);
+                        const auto& exFluidState = problem_().boundaryFluidState(myIdx, dir_id);
                         BoundaryConditionData bcdata{free ? BCType::FREE : BCType::RATE,
                                                      massrate,
                                                      exFluidState.pvtRegionIndex(),