diff --git a/WordPress/src/main/java/org/wordpress/android/ui/selfhostedusers/SelfHostedUsersScreen.kt b/WordPress/src/main/java/org/wordpress/android/ui/selfhostedusers/SelfHostedUsersScreen.kt
index 4b318961524..de582dc5089 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/selfhostedusers/SelfHostedUsersScreen.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/selfhostedusers/SelfHostedUsersScreen.kt
@@ -167,9 +167,14 @@ private fun UserDetail(
             .fillMaxWidth()
     ) {
         Column {
+            val avatarUrl = user.avatarUrls?.values?.firstOrNull()
             UserAvatar(
-                avatarUrl = user.avatarUrls?.values?.firstOrNull(),
-                onAvatarClick = onAvatarClick
+                avatarUrl = avatarUrl,
+                onAvatarClick = if (avatarUrl.isNullOrEmpty()) {
+                    null
+                } else {
+                    onAvatarClick
+                }
             )
         }