diff --git a/opm/core/simulator/initStateEquil.hpp b/opm/core/simulator/initStateEquil.hpp
index 6eb58c548..a29cb135d 100644
--- a/opm/core/simulator/initStateEquil.hpp
+++ b/opm/core/simulator/initStateEquil.hpp
@@ -68,6 +68,8 @@ namespace Opm
      * \param[in] props    Property object, pvt and capillary properties are used.
      * \param[in] deck     Simulation deck, used to obtain EQUIL and related data.
      * \param[in] gravity  Acceleration of gravity, assumed to be in Z direction.
+     * \param[in] applySwatInit     Make it possible to not apply SWATINIT even if it
+     *                              is present in the deck
      */
     template<class Grid>
     void initStateEquil(const Grid& grid,
@@ -75,7 +77,8 @@ namespace Opm
                         const Opm::Deck& deck,
                         const Opm::EclipseState& eclipseState,
                         const double gravity,
-                        BlackoilState& state);
+                        BlackoilState& state,
+                        bool applySwatInit = true);
 
 
     /**
@@ -246,13 +249,17 @@ namespace Opm
                                      const Opm::Deck&             deck,
                                      const Opm::EclipseState& eclipseState,
                                      const Grid&                        G    ,
-                                     const double                       grav = unit::gravity)
+                                     const double grav = unit::gravity,
+                                     const std::vector<double>&  swat_init = {}
+                                     )
                     : pp_(props.numPhases(),
                           std::vector<double>(UgGridHelpers::numCells(G))),
                       sat_(props.numPhases(),
                           std::vector<double>(UgGridHelpers::numCells(G))),
                       rs_(UgGridHelpers::numCells(G)),
-                      rv_(UgGridHelpers::numCells(G))
+                      rv_(UgGridHelpers::numCells(G)),
+                      swat_init_(swat_init)
+
                 {
                     // Get the equilibration records.
                     const std::vector<EquilRecord> rec = getEquil(eclipseState);
@@ -340,20 +347,6 @@ namespace Opm
                         }
                     }
                     
-
-                    // Check for presence of kw SWATINIT
-                    if (deck.hasKeyword("SWATINIT")) {
-                        const std::vector<double>& swat_init = eclipseState.
-                                get3DProperties().getDoubleGridProperty("SWATINIT").getData();
-                        const int nc = UgGridHelpers::numCells(G);
-                        swat_init_.resize(nc);
-                        const int* gc = UgGridHelpers::globalCell(G);
-                        for (int c = 0; c < nc; ++c) {
-                            const int deck_pos = (gc == NULL) ? c : gc[c];
-                            swat_init_[c] = swat_init[deck_pos];
-                        }
-                    }
-
                     // Compute pressures, saturations, rs and rv factors.
                     calcPressSatRsRv(eqlmap, rec, props, G, grav);
 
diff --git a/opm/core/simulator/initStateEquil_impl.hpp b/opm/core/simulator/initStateEquil_impl.hpp
index f0d948e5e..29ba08d3a 100644
--- a/opm/core/simulator/initStateEquil_impl.hpp
+++ b/opm/core/simulator/initStateEquil_impl.hpp
@@ -882,6 +882,8 @@ namespace Opm
      * \param[in] props    Property object, pvt and capillary properties are used.
      * \param[in] deck     Simulation deck, used to obtain EQUIL and related data.
      * \param[in] gravity  Acceleration of gravity, assumed to be in Z direction.
+     * \param[in] applySwatInit     Make it possible to not apply SWATINIT even if it
+     *                              is present in the deck
      */
     template<class Grid>
     void initStateEquil(const Grid& grid,
@@ -889,10 +891,26 @@ namespace Opm
                         const Opm::Deck& deck,
                         const Opm::EclipseState& eclipseState,
                         const double gravity,
-                        BlackoilState& state)
+                        BlackoilState& state,
+                        bool applySwatinit = true)
     {
+
         typedef EQUIL::DeckDependent::InitialStateComputer ISC;
-        ISC isc(props, deck, eclipseState, grid, gravity);
+        //Check for presence of kw SWATINIT
+        std::vector<double> swat_init = {};
+        if (eclipseState.get3DProperties().hasDeckDoubleGridProperty("SWATINIT") && applySwatinit) {
+            const std::vector<double>& swat_init_ecl = eclipseState.
+                    get3DProperties().getDoubleGridProperty("SWATINIT").getData();
+            const int nc = UgGridHelpers::numCells(grid);
+            swat_init.resize(nc);
+            const int* gc = UgGridHelpers::globalCell(grid);
+            for (int c = 0; c < nc; ++c) {
+                const int deck_pos = (gc == NULL) ? c : gc[c];
+                swat_init[c] = swat_init_ecl[deck_pos];
+            }
+        }
+
+        ISC isc(props, deck, eclipseState, grid, gravity, swat_init);
         const auto pu = props.phaseUsage();
         const int ref_phase = pu.phase_used[BlackoilPhases::Liquid]
             ? pu.phase_pos[BlackoilPhases::Liquid]