diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/Bluesky.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/Bluesky.kt
index 4c616dca9..161555760 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/Bluesky.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/Bluesky.kt
@@ -219,7 +219,7 @@ internal fun List<ListNotificationsNotification>.toDb(
                                 ListNotificationsNotificationReason.Repost -> it.decodeAs<Repost>().subject
                                 ListNotificationsNotificationReason.Like -> it.decodeAs<Like>().subject
                             }
-                        }?.uri
+                        }.uri
                         .let {
                             references[it]
                         }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyDataSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyDataSource.kt
index fe2cefdf4..ffcfefb76 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyDataSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyDataSource.kt
@@ -1048,19 +1048,17 @@ internal class MisskeyDataSource(
                     ),
                 )
         }.onSuccess { response ->
-            if (response.id != null) {
-                MemoryPagingSource.updateWith<UiList>(
-                    key = listKey,
-                ) {
-                    it
-                        .plus(
-                            UiList(
-                                id = response.id,
-                                title = metaData.title,
-                                platformType = PlatformType.Mastodon,
-                            ),
-                        ).toImmutableList()
-                }
+            MemoryPagingSource.updateWith<UiList>(
+                key = listKey,
+            ) {
+                it
+                    .plus(
+                        UiList(
+                            id = response.id,
+                            title = metaData.title,
+                            platformType = PlatformType.Mastodon,
+                        ),
+                    ).toImmutableList()
             }
         }
     }
@@ -1219,14 +1217,12 @@ internal class MisskeyDataSource(
                             listId = listId,
                         ),
                     )
-            if (list.id != null) {
-                MemCacheable.updateWith<ImmutableList<UiList>>(
-                    key = userListsKey(userKey),
-                ) {
-                    it
-                        .plus(list.render())
-                        .toImmutableList()
-                }
+            MemCacheable.updateWith<ImmutableList<UiList>>(
+                key = userListsKey(userKey),
+            ) {
+                it
+                    .plus(list.render())
+                    .toImmutableList()
             }
         }
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/SearchUserPagingSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/SearchUserPagingSource.kt
index c87f11629..8b5e2821d 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/SearchUserPagingSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/SearchUserPagingSource.kt
@@ -34,8 +34,6 @@ internal class SearchUserPagingSource(
                             (params.key ?: 0) + params.loadSize
                         },
                 )
-            } ?: run {
-            return LoadResult.Error(Exception("No data"))
-        }
+            }
     }
 }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/TrendHashtagPagingSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/TrendHashtagPagingSource.kt
index e5071c4ce..d0812feb4 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/TrendHashtagPagingSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/TrendHashtagPagingSource.kt
@@ -21,7 +21,7 @@ internal class TrendHashtagPagingSource(
                 )
             }.let {
                 return LoadResult.Page(
-                    data = it ?: emptyList(),
+                    data = it,
                     prevKey = null,
                     nextKey = null,
                 )
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Mastodon.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Mastodon.kt
index 10853a7a0..e07893922 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Mastodon.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Mastodon.kt
@@ -998,7 +998,7 @@ private fun parseName(status: Account): Element {
                 "<img src=\"${it.url}\" alt=\"${it.shortcode}\" />",
             )
     }
-    return parseHtml(content) as Element
+    return parseHtml(content)
 }
 
 internal fun parseMastodonContent(
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 8f1c5c831..d2d2d4655 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
@@ -832,7 +832,7 @@ private fun parseName(
     if (name.isEmpty()) {
         return Element("body")
     }
-    return misskeyNameParser.parse(name).toHtml(accountKey, emojis, accountKey.host) as Element
+    return misskeyNameParser.parse(name).toHtml(accountKey, emojis, accountKey.host)
 }
 
 private fun moe.tlaster.mfm.parser.tree.Node.toHtml(