diff --git a/app/src/main/java/com/keylesspalace/tusky/viewdata/StatusViewData.kt b/app/src/main/java/com/keylesspalace/tusky/viewdata/StatusViewData.kt
index d02569d41..c3bf14183 100644
--- a/app/src/main/java/com/keylesspalace/tusky/viewdata/StatusViewData.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/viewdata/StatusViewData.kt
@@ -60,7 +60,11 @@ sealed class StatusViewData private constructor() {
             get() = status.actionableStatus
 
         val rebloggedAvatar: String?
-            get() = status.reblog?.account?.avatar
+            get() = if (status.reblog != null) {
+                status.account.avatar
+            } else {
+                null
+            }
 
         val rebloggingStatus: Status?
             get() = if (status.reblog != null) status else null