diff --git a/app/views/issues/_form_custom_fields.html.erb b/app/views/issues/_form_custom_fields.html.erb
index 6182c28f6..2e12c00e8 100644
--- a/app/views/issues/_form_custom_fields.html.erb
+++ b/app/views/issues/_form_custom_fields.html.erb
@@ -1,4 +1,5 @@
 <% custom_field_values = @issue.editable_custom_field_values %>
+<% if custom_field_values.present? %>
 <div class="splitcontent">
 <div class="splitcontentleft">
 <% i = 0 %>
@@ -12,3 +13,4 @@
 <% end -%>
 </div>
 </div>
+<% end %>