diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/Misskey.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/Misskey.kt
index 5d81a3ad..c42abf6e 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/Misskey.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/Misskey.kt
@@ -161,7 +161,7 @@ private fun List<Note>.toDbPagingTimeline(
             references =
                 listOfNotNull(
                     if (it.renote != null) {
-                        if (it.text.isNullOrEmpty() && it.files.isNullOrEmpty()) {
+                        if (it.text.isNullOrEmpty() && it.files.isNullOrEmpty() && it.poll == null) {
                             ReferenceType.Retweet to it.renote.toDbStatusWithUser(accountKey)
                         } else {
                             ReferenceType.Quote to it.renote.toDbStatusWithUser(accountKey)
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Misskey.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Misskey.kt
index 9d343f43..74f97a0d 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Misskey.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Misskey.kt
@@ -334,7 +334,7 @@ internal fun Note.renderStatus(
         user = user,
         quote =
             listOfNotNull(
-                if (text != null || !files.isNullOrEmpty() || cw != null) {
+                if (text != null || !files.isNullOrEmpty() || cw != null || poll != null) {
                     renote?.renderStatus(accountKey, event)
                 } else {
                     null