diff --git a/library/src/scala/math/BigDecimal.scala b/library/src/scala/math/BigDecimal.scala
index 8f53190d4d2f..1499b646c6c2 100644
--- a/library/src/scala/math/BigDecimal.scala
+++ b/library/src/scala/math/BigDecimal.scala
@@ -22,6 +22,7 @@ import java.math.{
   RoundingMode => JRM,
 }
 import scala.collection.immutable.NumericRange
+import scala.runtime.ScalaRunTime.mapNull
 
 object BigDecimal {
   private final val maximumHashScale = 4934           // Quit maintaining hash identity with BigInt beyond this scale
@@ -304,8 +305,13 @@ object BigDecimal {
   /** Implicit conversion from `Double` to `BigDecimal`. */
   implicit def double2bigDecimal(d: Double): BigDecimal = decimal(d)
 
+  // For the following function, both the parameter and the return type are non-nullable.
+  // However, if a null reference is passed explicitly, this method will still return null.
+  // We intentionally keep this signature to discourage passing nulls implicitly while
+  // preserving the previous behavior for backward compatibility.
+
   /** Implicit conversion from `java.math.BigDecimal` to `scala.BigDecimal`. */
-  implicit def javaBigDecimal2bigDecimal(x: BigDec | Null): BigDecimal | Null = if (x == null) null else apply(x)
+  implicit def javaBigDecimal2bigDecimal(x: BigDec): BigDecimal = mapNull(x, apply(x))
 }
 
 /**
diff --git a/tests/explicit-nulls/pos/i24599.scala b/tests/explicit-nulls/pos/i24599.scala
new file mode 100644
index 000000000000..2459b0fbc3ed
--- /dev/null
+++ b/tests/explicit-nulls/pos/i24599.scala
@@ -0,0 +1,10 @@
+import java.math.{BigDecimal => JBigDecimal}
+import java.math.{BigInteger => JBigInteger}
+
+opaque type CurrencyValue = BigDecimal
+
+extension (value: CurrencyValue)
+  def negate: CurrencyValue = value.bigDecimal.negate().nn
+
+def testBigDecimalConversion(jbd: JBigDecimal): BigDecimal = jbd
+def testBigIntConversion(jbi: JBigInteger): BigInt = jbi
\ No newline at end of file