diff --git a/app/models/form/page.rb b/app/models/form/page.rb
index 4d6ab21ff..07b8203b9 100644
--- a/app/models/form/page.rb
+++ b/app/models/form/page.rb
@@ -37,7 +37,8 @@ class Form::Page
     @conditional_questions ||= questions.flat_map { |q|
       next if q.conditional_for.blank?
 
-      q.conditional_for.keys
+      # TODO: remove this condition once all conditional questions no longer need JS
+      q.conditional_for.keys if q.type == "radio"
     }.compact
   end
 
diff --git a/app/views/form/page.html.erb b/app/views/form/page.html.erb
index 0925f6ee8..92922f76c 100644
--- a/app/views/form/page.html.erb
+++ b/app/views/form/page.html.erb
@@ -32,7 +32,7 @@
       <%= form_with model: @case_log, url: form_case_log_path(@case_log), method: "post" do |f| %>
         <%= f.govuk_error_summary %>
         <% @page.non_conditional_questions.map do |question| %>
-          <div id=<%= question.id + "_div " %> >
+          <div id=<%= question.id + "_div " %><%= display_question_key_div(@page, question) %> >
             <% if question.read_only? %>
               <hr class="govuk-section-break govuk-section-break--visible govuk-section-break--m">
             <% end %>