diff --git a/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/UsernameRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/UsernameRepository.kt
index d0d04ba8af..913a2a0d86 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/UsernameRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/UsernameRepository.kt
@@ -219,6 +219,9 @@ object UsernameRepository {
       } catch (e: UsernameIsNotAssociatedWithAnAccountException) {
         Log.w(TAG, "[fetchAciFromUsername] Failed to get ACI for username hash", e)
         UsernameAciFetchResult.NotFound
+      } catch (e: BaseUsernameException) {
+        Log.w(TAG, "[fetchAciFromUsername] Invalid username", e)
+        UsernameAciFetchResult.NotFound
       } catch (e: IOException) {
         Log.w(TAG, "[fetchAciFromUsername] Hit network error while trying to resolve ACI from username", e)
         UsernameAciFetchResult.NetworkError