diff --git a/app/src/main/java/chat/revolt/components/screens/settings/UserOverview.kt b/app/src/main/java/chat/revolt/components/screens/settings/UserOverview.kt
index a5820517..abb1eff0 100644
--- a/app/src/main/java/chat/revolt/components/screens/settings/UserOverview.kt
+++ b/app/src/main/java/chat/revolt/components/screens/settings/UserOverview.kt
@@ -140,7 +140,7 @@ fun RawUserOverview(user: User, profile: Profile? = null) {
                 userId = user.id ?: ULID.makeSpecial(0),
                 avatar = user.avatar,
                 size = 48.dp,
-                presence = presenceFromStatus(user.status?.presence)
+                presence = presenceFromStatus(user.status?.presence, user.online ?: false)
             )
 
             Spacer(modifier = Modifier.width(12.dp))
diff --git a/app/src/main/java/chat/revolt/screens/chat/ChatRouterScreen.kt b/app/src/main/java/chat/revolt/screens/chat/ChatRouterScreen.kt
index 7d5f4e63..80281cdb 100644
--- a/app/src/main/java/chat/revolt/screens/chat/ChatRouterScreen.kt
+++ b/app/src/main/java/chat/revolt/screens/chat/ChatRouterScreen.kt
@@ -764,7 +764,8 @@ fun Sidebar(
                     }
                         ?: "",
                     presence = presenceFromStatus(
-                        RevoltAPI.userCache[RevoltAPI.selfId]?.status?.presence
+                        RevoltAPI.userCache[RevoltAPI.selfId]?.status?.presence,
+                        RevoltAPI.userCache[RevoltAPI.selfId]?.online ?: false
                     ),
                     userId = RevoltAPI.selfId ?: "",
                     avatar = RevoltAPI.userCache[RevoltAPI.selfId]?.avatar,
@@ -821,7 +822,8 @@ fun Sidebar(
                                     )
                                 } ?: it.name ?: "?",
                                 presence = presenceFromStatus(
-                                    partner?.status?.presence
+                                    partner?.status?.presence,
+                                    partner?.online ?: false
                                 ),
                                 userId = partner?.id ?: it.id ?: "",
                                 avatar = partner?.avatar ?: it.icon,
diff --git a/app/src/main/java/chat/revolt/sheets/StatusSheet.kt b/app/src/main/java/chat/revolt/sheets/StatusSheet.kt
index f3b2555e..b2b9c1a8 100644
--- a/app/src/main/java/chat/revolt/sheets/StatusSheet.kt
+++ b/app/src/main/java/chat/revolt/sheets/StatusSheet.kt
@@ -44,7 +44,10 @@ fun StatusSheet(onBeforeNavigation: () -> Unit, onGoSettings: () -> Unit) {
                 userId = selfUser.id ?: ULID.makeSpecial(0),
                 avatar = selfUser.avatar,
                 size = 48.dp,
-                presence = presenceFromStatus(selfUser.status?.presence)
+                presence = presenceFromStatus(
+                    selfUser.status?.presence,
+                    selfUser.online ?: false
+                )
             )
 
             Spacer(modifier = Modifier.width(12.dp))