diff --git a/opm/simulators/wells/BlackoilWellModel_impl.hpp b/opm/simulators/wells/BlackoilWellModel_impl.hpp
index fab8bf33b..71905d793 100644
--- a/opm/simulators/wells/BlackoilWellModel_impl.hpp
+++ b/opm/simulators/wells/BlackoilWellModel_impl.hpp
@@ -383,10 +383,11 @@ namespace Opm {
         const auto& comm = ebosSimulator_.vanguard().grid().comm();
         WellGroupHelpers::updateGuideRatesForWells(schedule(), phase_usage_, reportStepIdx, simulationTime, well_state_, comm, guideRate_.get());
         try {
-            // Compute initial well solution for new wells
+            // Compute initial well solution for new wells and injectors that change injection type i.e. WAG.
             for (auto& well : well_container_) {
                 const uint64_t effective_events_mask = ScheduleEvents::WELL_STATUS_CHANGE
-                                                    + ScheduleEvents::NEW_WELL;
+                        + ScheduleEvents::INJECTION_TYPE_CHANGED
+                        + ScheduleEvents::NEW_WELL;
 
                 const auto& events = schedule()[reportStepIdx].wellgroup_events();
                 const bool event = report_step_starts_ && events.hasEvent(well->name(), effective_events_mask);
diff --git a/opm/simulators/wells/WellStateFullyImplicitBlackoil.hpp b/opm/simulators/wells/WellStateFullyImplicitBlackoil.hpp
index 87e9a74e4..e9ede1547 100644
--- a/opm/simulators/wells/WellStateFullyImplicitBlackoil.hpp
+++ b/opm/simulators/wells/WellStateFullyImplicitBlackoil.hpp
@@ -207,7 +207,7 @@ namespace Opm
                         }
 
                         if (is_producer_[newIndex] != prevState->is_producer_[oldIndex]) {
-                            // Well changed from injector from/to producer, do not use its privious values.
+                            // Well changed to/from injector from/to producer, do not use its privious values.
                             continue;
                         }