diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/SocialRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/SocialRepository.kt
index ef50e34f9..dbca880a1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/SocialRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/SocialRepository.kt
@@ -85,7 +85,6 @@ interface SocialRepository : BaseRepository {
     suspend fun inviteToGroup(id: String, inviteData: Map<String, Any>): List<InviteResponse>?
 
     suspend fun retrieveMember(userId: String?, fromHall: Boolean = false): Member?
-    suspend fun retrieveMemberWithUsername(username: String?, fromHall: Boolean): Member?
 
     suspend fun findUsernames(
         username: String,
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.kt
index ccbe6f786..b3adf5c24 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.kt
@@ -263,31 +263,21 @@ class SocialRepositoryImpl(
         return if (userId == null) {
             null
         } else {
-            try {
-                if (fromHall) {
-                    apiClient.getHallMember(userId)
-                } else {
-                    apiClient.getMember(UUID.fromString(userId).toString())
+            if (fromHall) {
+                apiClient.getHallMember(userId)
+            } else {
+                try {
+                    val uuid = UUID.fromString(userId).toString()
+                    apiClient.getMember(uuid)
+                } catch (_: IllegalArgumentException) {
+                    apiClient.getMemberWithUsername(userId)
                 }
-            } catch (_: IllegalArgumentException) {
-                null
             }
         }
     }
 
     override suspend fun retrievegroupInvites(id: String, includeAllPublicFields: Boolean) = apiClient.getGroupInvites(id, includeAllPublicFields)
 
-    override suspend fun retrieveMemberWithUsername(username: String?, fromHall: Boolean): Member? {
-        if (username.isNullOrBlank()) {
-            return null
-        }
-        return try {
-            apiClient.getMemberWithUsername(username)
-        } catch (_: IllegalArgumentException) {
-            null
-        }
-    }
-
     override suspend fun findUsernames(username: String, context: String?, id: String?): List<FindUsernameResult>? {
         return apiClient.findUsernames(username, context, id)
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxOverviewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxOverviewFragment.kt
index f67ddd505..a9db6cd71 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxOverviewFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxOverviewFragment.kt
@@ -125,7 +125,7 @@ class InboxOverviewFragment : BaseMainFragment<FragmentInboxBinding>(), androidx
                 lifecycleScope.launch(ExceptionHandler.coroutine()) {
                     var member: Member? = null
                     try {
-                        member = socialRepository.retrieveMemberWithUsername(username, false)
+                        member = socialRepository.retrieveMember(username, false)
                     } finally {
                         if (member != null) {
                             alert.dismiss()
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/InboxViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/InboxViewModel.kt
index e5154f3c9..1a975f07b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/InboxViewModel.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/InboxViewModel.kt
@@ -73,7 +73,7 @@ class InboxViewModel @Inject constructor(
             setMemberID(recipientID)
         } else if (recipientUsername?.isNotBlank() == true) {
             viewModelScope.launch(ExceptionHandler.coroutine()) {
-                val member = socialRepository.retrieveMemberWithUsername(recipientUsername, false)
+                val member = socialRepository.retrieveMember(recipientUsername, false)
                 setMemberID(member?.id ?: "")
                 invalidateDataSource()
                 dataSourceFactory.updateRecipientID(memberID)
diff --git a/build.gradle b/build.gradle
index fd0eef72f..ed12525bc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -42,7 +42,7 @@ buildscript {
         classpath 'com.android.tools.build:gradle:8.1.0'
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
         classpath 'com.google.gms:google-services:4.3.15'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.5'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.8'
         classpath "io.realm:realm-gradle-plugin:10.13.2-transformer-api"
         classpath("io.realm.kotlin:gradle-plugin:$realm_version")
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"