diff --git a/app/helpers/details_table_helper.rb b/app/helpers/details_table_helper.rb
index 2ba89e2fb..f58720591 100644
--- a/app/helpers/details_table_helper.rb
+++ b/app/helpers/details_table_helper.rb
@@ -1,37 +1,42 @@
 module DetailsTableHelper
   def details_html(attribute, resource = nil)
+    resource_class = resource.class.name
+
     if attribute[:format] == :bullet && attribute[:value].length > 1
       list = attribute[:value].map { |value| "<li>#{value}</li>" }.join
       simple_format(list, { class: "govuk-list govuk-list--bullet" }, wrapper_tag: "ul")
     else
       return simple_format(attribute[:value].first.to_s, { class: "govuk-body" }, wrapper_tag: "p") if attribute[:value].is_a?(Array) && attribute[:value].any?
 
-      value = determine_value(attribute, resource)
+      value = determine_value(attribute, resource, resource_class)
       simple_format(value.to_s, { class: "govuk-body" }, wrapper_tag: "p")
     end
   end
 
 private
 
-  def determine_value(attribute, resource)
-    attribute[:value].presence || send("#{resource.class.name.downcase}_value", attribute, resource) || "<span class=\"app-!-colour-muted\">No answer provided</span>".html_safe
+  def determine_value(attribute, resource, resource_class)
+    attribute[:value].presence || case resource_class
+                                  when "Location"
+                                    location_value(attribute, resource)
+                                  when "Organisation"
+                                    organisation_value(attribute, resource)
+                                  when "Scheme"
+                                    scheme_value(attribute, resource)
+                                  else
+                                    "<span class=\"app-!-colour-muted\">No answer provided</span>".html_safe
+                                  end
   end
 
   def location_value(attribute, resource)
-    return nil unless LocationPolicy.new(current_user, resource).update?
-
-    govuk_link_to(location_details_link_message(attribute), location_edit_path(resource, attribute[:attribute]), class: "govuk-link govuk-link--no-visited-state")
+    LocationPolicy.new(current_user, resource).update? ? govuk_link_to(location_details_link_message(attribute), location_edit_path(resource, attribute[:attribute]), class: "govuk-link govuk-link--no-visited-state") : "<span class=\"app-!-colour-muted\">No answer provided</span>".html_safe
   end
 
   def organisation_value(attribute, resource)
-    return nil unless can_edit_org?(current_user) && attribute[:editable]
-
-    govuk_link_to(organisation_details_link_message(attribute), edit_organisation_path(resource), class: "govuk-link govuk-link--no-visited-state")
+    can_edit_org?(current_user) && attribute[:editable] ? govuk_link_to(organisation_details_link_message(attribute), edit_organisation_path(resource), class: "govuk-link govuk-link--no-visited-state") : "<span class=\"app-!-colour-muted\">No answer provided</span>".html_safe
   end
 
   def scheme_value(attribute, resource)
-    return nil unless can_change_scheme_answer?(attribute[:name], resource)
-
-    govuk_link_to(scheme_details_link_message(attribute), scheme_edit_path(resource, attribute), class: "govuk-link govuk-link--no-visited-state")
+    can_change_scheme_answer?(attribute[:name], resource) ? govuk_link_to(scheme_details_link_message(attribute), scheme_edit_path(resource, attribute), class: "govuk-link govuk-link--no-visited-state") : "<span class=\"app-!-colour-muted\">No answer provided</span>".html_safe
   end
 end