diff --git a/src/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java b/src/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java

--- openjdk/jdk/src/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java

+++ openjdk/jdk/src/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java

@@ -160,20 +160,10 @@

                 }

             }

         } else {        // default curves

-            int[] ids;

-            if (requireFips) {

-                ids = new int[] {

-                    // only NIST curves in FIPS mode

-                    23, 24, 25, 9, 10, 11, 12, 13, 14,

-                };

-            } else {

-                ids = new int[] {

-                    // NIST curves first

-                    23, 24, 25, 9, 10, 11, 12, 13, 14,

-                    // non-NIST curves

-                    22,

-                };

-            }

+            int[] ids = new int[] { 

+		// NSS currently only supports these three NIST curves

+		23, 24, 25

+	    };

             idList = new ArrayList<>(ids.length);

             for (int curveId : ids) {