diff --git a/application/forms/IcingaServiceForm.php b/application/forms/IcingaServiceForm.php
index b1eb7e6d..531c8b1b 100644
--- a/application/forms/IcingaServiceForm.php
+++ b/application/forms/IcingaServiceForm.php
@@ -139,6 +139,14 @@ class IcingaServiceForm extends DirectorObjectForm
         } else {
             $this->addOverrideHint();
             $group = $this->getDisplayGroup('custom_fields');
+            if (! $group) {
+                foreach ($this->getDisplayGroups() as $groupName => $eventualGroup) {
+                    if (preg_match('/^custom_fields:/', $groupName)) {
+                        $group = $eventualGroup;
+                        break;
+                    }
+                }
+            }
             if ($group) {
                 $elements = $group->getElements();
                 $group->setElements([$this->getElement('inheritance_hint')]);
diff --git a/doc/82-Changelog.md b/doc/82-Changelog.md
index 08e1b126..fd38cfa8 100644
--- a/doc/82-Changelog.md
+++ b/doc/82-Changelog.md
@@ -16,6 +16,7 @@ next (will be 1.9.0)
 
 ### User Interface
 * FIX: allow switching DB config while connection is failing (#2300)
+* FIX: show Override button when all Fields belong to Field Categories (#2303)
 
 next patch release (will be 1.8.1)
 ----------------------------------