diff --git a/opm/simulators/wells/WellStateFullyImplicitBlackoil.hpp b/opm/simulators/wells/WellStateFullyImplicitBlackoil.hpp
index d84d29cbb..a434baed8 100644
--- a/opm/simulators/wells/WellStateFullyImplicitBlackoil.hpp
+++ b/opm/simulators/wells/WellStateFullyImplicitBlackoil.hpp
@@ -238,13 +238,11 @@ namespace Opm
                         // thp
                         thp()[ newIndex ] = prevState->thp()[ oldIndex ];
 
-                         // Currently this is taken care of by updateWellStateFromTarge. Maybe we should just remove the initialization and just use updateWellStateFromTarget
-                         //if (effective_events_occurred_[w]) {
-                         //   continue;
-                         //}
-
-                        current_injection_controls_[ newIndex ] = prevState->currentInjectionControls()[ oldIndex ];
-                        current_production_controls_[ newIndex ] = prevState->currentProductionControls()[ oldIndex ];
+                        // If new target is set using WCONPROD, WCONINJE etc. we change to the new control.
+                        if (!effective_events_occurred_[w]) {
+                            current_injection_controls_[ newIndex ] = prevState->currentInjectionControls()[ oldIndex ];
+                            current_production_controls_[ newIndex ] = prevState->currentProductionControls()[ oldIndex ];
+                        }
 
                         // wellrates
                         for( int i=0, idx=newIndex*np, oldidx=oldIndex*np; i<np; ++i, ++idx, ++oldidx )