diff --git a/core-util-jvm/src/main/java/org/signal/core/util/E164Util.kt b/core-util-jvm/src/main/java/org/signal/core/util/E164Util.kt
index ffc9e424e4..502d14f959 100644
--- a/core-util-jvm/src/main/java/org/signal/core/util/E164Util.kt
+++ b/core-util-jvm/src/main/java/org/signal/core/util/E164Util.kt
@@ -66,7 +66,9 @@ object E164Util {
    * value is needed for user display.
    */
   @JvmStatic
-  fun formatAsE164WithCountryCodeForDisplay(countryCode: String, input: String): String {
+  fun formatAsE164WithCountryCodeForDisplay(countryCode: String, input: String?): String {
+    val input = input ?: ""
+
     val result: String? = formatAsE164WithCountryCode(countryCode, input)
     if (result != null) {
       return result