diff --git a/CHANGELOG.md b/CHANGELOG.md
index 648cd3d0963e6..af40440c1c93d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -39,7 +39,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ### Changed
 - Create generic DocRequest to better categorize ActionRequests ([#18269](https://github.com/opensearch-project/OpenSearch/pull/18269)))
-- Change implementation for `percentiles` aggregation for latency improvement [#18124](https://github.com/opensearch-project/OpenSearch/pull/18124)
+- Change implementation for `percentiles` aggregation for latency improvement ([#18124](https://github.com/opensearch-project/OpenSearch/pull/18124))
+- Update FipsMode check to catch NoSuchMethodError ([#18427](https://github.com/opensearch-project/OpenSearch/pull/18427))
 
 ### Dependencies
 - Update Apache Lucene from 10.1.0 to 10.2.1 ([#17961](https://github.com/opensearch-project/OpenSearch/pull/17961))
diff --git a/test/framework/src/main/java/org/opensearch/fips/FipsMode.java b/test/framework/src/main/java/org/opensearch/fips/FipsMode.java
index 36f331054b50c..0ee9fd928ec71 100644
--- a/test/framework/src/main/java/org/opensearch/fips/FipsMode.java
+++ b/test/framework/src/main/java/org/opensearch/fips/FipsMode.java
@@ -15,7 +15,7 @@ public class FipsMode {
     public static Check CHECK = () -> {
         try {
             return CryptoServicesRegistrar.isInApprovedOnlyMode();
-        } catch (NoClassDefFoundError e) {
+        } catch (NoClassDefFoundError | NoSuchMethodError e) {
             return false;
         }
     };