diff --git a/app/components/provider_interface/diversity_information_component.rb b/app/components/provider_interface/diversity_information_component.rb
index e8cd7d3c9c4..0cb2f15df51 100644
--- a/app/components/provider_interface/diversity_information_component.rb
+++ b/app/components/provider_interface/diversity_information_component.rb
@@ -40,11 +40,12 @@ def offer_context
     end
 
     def disability_value
-      disabilities = equality_and_diversity['disabilities'].map do |disability|
+      disabilities = Array(equality_and_diversity['disabilities'])
+      disability_list_items = disabilities.map do |disability|
         "<li>#{disability} </li>"
       end
 
-      "<ul class=\"govuk-list\">#{disabilities.join}</ul>"
+      "<ul class=\"govuk-list\">#{disability_list_items.join}</ul>"
     end
 
     def application_in_correct_state?
diff --git a/spec/components/provider_interface/diversity_information_component_spec.rb b/spec/components/provider_interface/diversity_information_component_spec.rb
index ddd07b4c1f6..660af2a7256 100644
--- a/spec/components/provider_interface/diversity_information_component_spec.rb
+++ b/spec/components/provider_interface/diversity_information_component_spec.rb
@@ -78,7 +78,7 @@
           expect(result.text).to include('Chinese')
         end
 
-        it 'does not dispay Ethnic background if they are not declared' do
+        it 'does not display Ethnic background if they are not declared' do
           prefer_not_to_say_diversity_info = { 'sex' => 'Prefer not to say',
                                                'disabilities' => ['I do not have any of these disabilities or health conditions'],
                                                'ethnic_group' => 'Prefer not to say',
@@ -119,6 +119,26 @@
           result = render_inline(described_class.new(application_choice:, current_provider_user: provider_user))
           expect(result.text).to include('Prefer not to say')
         end
+
+        it 'displays nothing for disabilities when they are nil' do
+          nil_disabilities_diversity_info = { 'sex' => 'female',
+                                              'disabilities' => nil,
+                                              'ethnic_group' => 'Asian or Asian British',
+                                              'ethnic_background' => 'Chinese' }
+
+          application_form = build_stubbed(
+            :application_form,
+            equality_and_diversity: nil_disabilities_diversity_info,
+          )
+          application_choice = build(:application_choice,
+                                     application_form:,
+                                     course:,
+                                     current_course: course,
+                                     status: 'pending_conditions')
+
+          result = render_inline(described_class.new(application_choice:, current_provider_user: provider_user))
+          expect(result.text).to include('Disabilities and health conditions')
+        end
       end
 
       context 'when provider user does not have permissions to view diversity information and the application is accepted' do