diff --git a/opm/autodiff/FullyImplicitBlackoilSolver_impl.hpp b/opm/autodiff/FullyImplicitBlackoilSolver_impl.hpp
index 670b5f43a..d439ad2c5 100644
--- a/opm/autodiff/FullyImplicitBlackoilSolver_impl.hpp
+++ b/opm/autodiff/FullyImplicitBlackoilSolver_impl.hpp
@@ -528,11 +528,11 @@ namespace {
                 so = so - sw;
             }
 
-            // Define Sg Rs and Rv in terms of xvar.
-            std::vector<int> all_cells = buildAllCells(nc);
-            ADB rsSat = fluidRsSat(state.pressure,all_cells);
-            ADB rvSat = fluidRvSat(state.pressure,all_cells);
             if (active_[ Gas]) {
+                // Define Sg Rs and Rv in terms of xvar.
+                std::vector<int> all_cells = buildAllCells(nc);
+                ADB rsSat = fluidRsSat(state.pressure,all_cells);
+                ADB rvSat = fluidRvSat(state.pressure,all_cells);
                 ADB xvar = vars[ nextvar++ ];
                 ADB sg = isSg*xvar + isRv* so;
                 state.saturation[ pu.phase_pos[ Gas ] ] = sg;