diff --git a/src/java.base/share/classes/jdk/internal/icu/impl/NormalizerImpl.java b/src/java.base/share/classes/jdk/internal/icu/impl/NormalizerImpl.java
index 1b94a0bc230..82f294c31cf 100644
--- a/src/java.base/share/classes/jdk/internal/icu/impl/NormalizerImpl.java
+++ b/src/java.base/share/classes/jdk/internal/icu/impl/NormalizerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1906,7 +1906,7 @@ public final class NormalizerImpl {
                 pStart = 0;
                 p = norm.toCharArray();
                 length = p.length;
-                int cpNum = norm.codePointCount();
+                int cpNum = norm.codePointCount(0, length);
                 cc= UCharacter.getCombiningClass(norm.codePointAt(0));
                 trailCC= UCharacter.getCombiningClass(norm.codePointAt(cpNum-1));
                 if (length == 1) {