diff --git a/app/flows/check_uk_visa_flow/outcomes/_electronic_travel_authorisation_advice.erb b/app/flows/check_uk_visa_flow/outcomes/_electronic_travel_authorisation_advice.erb
index 6a2301b4f28..0bad45b4480 100644
--- a/app/flows/check_uk_visa_flow/outcomes/_electronic_travel_authorisation_advice.erb
+++ b/app/flows/check_uk_visa_flow/outcomes/_electronic_travel_authorisation_advice.erb
@@ -1,5 +1,5 @@
 <% if calculator.passport_country_in_eta_rollout_group_1_rest_of_the_world? %>
   ^If you’re travelling on or after 8 January 2025, you’ll need to apply for an [electronic travel authorisation (ETA)](/guidance/apply-for-an-electronic-travel-authorisation-eta). 
 <% elsif calculator.passport_country_in_eta_rollout_group_2_eu_eea? %>
-  ^If you’re travelling on or after 2 April 2025, you’ll need to apply for an [electronic travel authorisation (ETA)](/guidance/apply-for-an-electronic-travel-authorisation-eta). You’ll be able to apply from 5 March 2025.
+  ^If you’re travelling on or after 2 April 2025, you’ll need to apply for an [electronic travel authorisation (ETA)](/guidance/apply-for-an-electronic-travel-authorisation-eta).
 <% end %>
diff --git a/app/flows/check_uk_visa_flow/outcomes/outcome_no_visa_needed.erb b/app/flows/check_uk_visa_flow/outcomes/outcome_no_visa_needed.erb
index f018a7a05b0..fe1813bd4fc 100644
--- a/app/flows/check_uk_visa_flow/outcomes/outcome_no_visa_needed.erb
+++ b/app/flows/check_uk_visa_flow/outcomes/outcome_no_visa_needed.erb
@@ -21,14 +21,16 @@
 
     However, you should bring evidence of your onward journey to show to officers at the UK border.
 
-    <%= render partial: "electronic_travel_authorisation_advice", locals: {calculator: calculator} %>
+    <%if !calculator.passport_EU_EEA_country_requires_electronic_travel_authorisation?%>
+      <%= render partial: "electronic_travel_authorisation_advice", locals: {calculator: calculator} %>
+    <% end %>
 
-    <% if calculator.travelling_to_ireland? %>
+    <% if calculator.travelling_to_ireland? && not(calculator.passport_EU_EEA_country_requires_electronic_travel_authorisation?)%>
       %You may want to [apply for a visa](/browse/visas-immigration/tourist-short-stay-visas) if you have a criminal record or you’ve previously been refused entry into the UK.%
     <% end %>
   <% end %>
 
-  <%if calculator.passport_country_requires_electronic_travel_authorisation? %>
+  <%if calculator.passport_country_requires_electronic_travel_authorisation?%>
     You do not need an ETA if you will not pass through UK border control. You should bring evidence of your onward journey, such as a ticket to your destination.
 
     You always pass through border control if you:
@@ -45,4 +47,27 @@
 
     %You may want to apply for a [transit visa](/transit-visa) instead if you have a criminal record or you’ve previously been refused entry into the UK.
   <% end %>
+
+  <%if calculator.passport_EU_EEA_country_requires_electronic_travel_authorisation?%>
+  ##If you’re travelling on or after 2 April 2025
+    You'll need an electronic travel authorisation (ETA) to pass through UK border control.
+
+    [Apply for an ETA](/guidance/apply-for-an-electronic-travel-authorisation-eta).
+
+    You do not need an ETA if you will not pass through UK border control. You should bring evidence of your onward journey, such as a ticket to your destination.
+
+        You always pass through border control if you:
+
+        + leave the main airport building for any reason
+        + need to collect your bags and check them in to your onward flight
+
+        You must also pass through border control if both:
+
+        + your onward flight leaves on a different calendar day to when you arrive
+        + there's nowhere for you to stay overnight in the airport, for example in a transit hotel
+
+        Check with your airline if you're not sure if you'll pass through UK border control.
+
+        %You may want to apply for a [transit visa](/transit-visa) instead if you have a criminal record or you’ve previously been refused entry into the UK.
+  <% end %>
 <% end %>
diff --git a/lib/smart_answer/calculators/uk_visa_calculator.rb b/lib/smart_answer/calculators/uk_visa_calculator.rb
index 1efdb5af021..d559bacd5d3 100644
--- a/lib/smart_answer/calculators/uk_visa_calculator.rb
+++ b/lib/smart_answer/calculators/uk_visa_calculator.rb
@@ -78,6 +78,10 @@ def passport_country_requires_electronic_travel_authorisation?
       COUNTRY_GROUP_ELECTRONIC_TRAVEL_AUTHORISATION.include?(@passport_country)
     end
 
+    def passport_EU_EEA_country_requires_electronic_travel_authorisation?
+      COUNTRY_GROUP_ETA_ROLLOUT_GROUP_2_EU_EEA.include?(@passport_country)
+    end
+
     def passport_country_in_epassport_gate_list?
       COUNTRY_GROUP_EPASSPORT_GATES.include?(@passport_country)
     end
diff --git a/test/flows/check_uk_visa_flow_test.rb b/test/flows/check_uk_visa_flow_test.rb
index 964d5a570bc..7e88049be1f 100644
--- a/test/flows/check_uk_visa_flow_test.rb
+++ b/test/flows/check_uk_visa_flow_test.rb
@@ -22,7 +22,7 @@ class CheckUkVisaFlowTest < ActiveSupport::TestCase
 
     @non_visa_national_eta_text = "You currently do not need an electronic travel authorisation (ETA)"
     @eta_rollout_group_1_rest_of_the_world_text = "If you’re travelling on or after 8 January 2025, you’ll need to apply for an electronic travel authorisation (ETA)."
-    @eta_rollout_group_2_eu_eea_text = "If you’re travelling on or after 2 April 2025, you’ll need to apply for an electronic travel authorisation (ETA). You’ll be able to apply from 5 March 2025."
+    @eta_rollout_group_2_eu_eea_text = "If you’re travelling on or after 2 April 2025, you’ll need to apply for an electronic travel authorisation (ETA)."
     @eea_eta_text = "You currently do not need an electronic travel authorisation (ETA)"
 
     # stub only the countries used in this test for less of a performance impact