diff --git a/eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml b/eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml
index 8604d7a0f679e..9216a9a8332ed 100755
--- a/eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml
+++ b/eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml
@@ -450,17 +450,7 @@
   <Match>
     <Or>
       <Class name="com.azure.security.keyvault.keys.KeyClient"/>
-      <Class name="com.azure.security.keyvault.keys.SecretClient"/>
-    </Or>
-    <Bug pattern="NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE"/>
-  </Match>
-
-  <!-- Incorrect flagging, if the response is null a HttpResponseException should be thrown
-    https://github.com/azure/azure-sdk-for-java/issues/4556 -->
-  <Match>
-    <Or>
-      <Class name="com.azure.security.keyvault.keys.KeyClient"/>
-      <Class name="com.azure.security.keyvault.keys.SecretClient"/>
+      <Class name="com.azure.security.keyvault.secrets.SecretClient"/>
     </Or>
     <Bug pattern="NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE"/>
   </Match>