diff --git a/hadoop-yarn-project/hadoop-yarn/dev-support/findbugs-exclude.xml b/hadoop-yarn-project/hadoop-yarn/dev-support/findbugs-exclude.xml
index bad2bacb1a57b..b98ac0bd921b2 100644
--- a/hadoop-yarn-project/hadoop-yarn/dev-support/findbugs-exclude.xml
+++ b/hadoop-yarn-project/hadoop-yarn/dev-support/findbugs-exclude.xml
@@ -726,12 +726,4 @@
     <Package name="org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.placement.schema" />
   </Match>
 
-  <!-- The ServiceScheduler#createConfigFileCache method uses the `load` method,
-       which is not allowed to return null; we can ignore it here. -->
-  <Match>
-    <Class name="org.apache.hadoop.yarn.service.ServiceScheduler"/>
-    <Method name="$1.load(ConfigFile)" />
-    <Bug pattern="NP_NONNULL_RETURN_VIOLATION"/>
-  </Match>
-
 </FindBugsFilter>
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/dev-support/findbugs-exclude.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/dev-support/findbugs-exclude.xml
index 15ce952ef3c7a..d7d79a3d16b3e 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/dev-support/findbugs-exclude.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/dev-support/findbugs-exclude.xml
@@ -56,4 +56,9 @@
       </Or>
       <Bug pattern="SE_BAD_FIELD" />
   </Match>
+  <Match>
+      <Class name="org.apache.hadoop.yarn.service.ServiceScheduler$1"/>
+      <Method name="load"/>
+      <Bug code="NP" pattern="NP_NONNULL_RETURN_VIOLATION"/>
+  </Match>
 </FindBugsFilter>