diff --git a/app/controllers/insured/group_selection_controller.rb b/app/controllers/insured/group_selection_controller.rb
index 5bbc5f15d93..c07369459d0 100644
--- a/app/controllers/insured/group_selection_controller.rb
+++ b/app/controllers/insured/group_selection_controller.rb
@@ -166,7 +166,7 @@ def create
         hbx_enrollment.update_osse_childcare_subsidy
         redirect_to thankyou_insured_plan_shopping_path(change_plan: @change_plan, market_kind: @market_kind, coverage_kind: @adapter.coverage_kind, id: hbx_enrollment.id, plan_id: @adapter.previous_hbx_enrollment.product_id)
       elsif @change_plan.present?
-        if EnrollRegistry.feature_enabled?(:choose_shopping_method)
+        if EnrollRegistry.feature_enabled?(:choose_shopping_method) && @adapter.coverage_kind == 'health'
           redirect_to choose_shopping_method_insured_plan_shopping_path(:id => hbx_enrollment.id, change_plan: @change_plan, market_kind: @market_kind, coverage_kind: @adapter.coverage_kind, enrollment_kind: @adapter.enrollment_kind)
         else
           redirect_to insured_plan_shopping_path(:id => hbx_enrollment.id, change_plan: @change_plan, market_kind: @market_kind, coverage_kind: @adapter.coverage_kind, enrollment_kind: @adapter.enrollment_kind)
diff --git a/app/views/insured/plan_shoppings/thankyou.html.erb b/app/views/insured/plan_shoppings/thankyou.html.erb
index 2f628db9be2..02c37f68267 100644
--- a/app/views/insured/plan_shoppings/thankyou.html.erb
+++ b/app/views/insured/plan_shoppings/thankyou.html.erb
@@ -32,8 +32,7 @@
           <dt><%= l10n('insured.plan_shoppings.thankyou.total_credit') %>:</dt>
           <dd><%= number_to_currency(@max_aptc, precision: 2) %></dd>
           <dt><%= l10n('insured.plan_shoppings.thankyou.max_credit') %>:</dt>
-          <% shopping_premium = shopping_group_premium(@plan.total_employee_cost, @plan.total_ehb_premium, @plan.total_childcare_subsidy_amount, @plan.can_use_aptc?) %>
-          <% per_plan_max = shopping_premium > @max_aptc ? @max_aptc : shopping_premium %>
+          <% per_plan_max = @plan.total_premium > @max_aptc ? @max_aptc : (@plan.total_premium - 1).round(2) %>
           <dd><%= number_to_currency(per_plan_max) %></dd>
         </dl>
         <p><%= l10n("insured.plan_shoppings.thankyou.aptc_instructions") %></p>