diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/data/local/dao/BookmarksDao.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/data/local/dao/BookmarksDao.kt
index 34c7de0a6..278b7c0e2 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/data/local/dao/BookmarksDao.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/data/local/dao/BookmarksDao.kt
@@ -58,13 +58,11 @@ class BookmarksDao @Inject constructor(private val kiwixDatabase: KiwixDatabase)
         Query.select(Bookmark.ROWID, Bookmark.BOOKMARK_URL)
       )
       while (bookmarkCursor.moveToNext()) {
-        var url = bookmarkCursor.get(Bookmark.BOOKMARK_URL)
-        url = operation.apply(url)
-        if (url != null) {
+        operation.apply(bookmarkCursor.get(Bookmark.BOOKMARK_URL))?.let { bookmarkUrl ->
           kiwixDatabase.update(
             Update.table(Bookmark.TABLE)
               .where(Bookmark.ROWID.eq(bookmarkCursor.get(Bookmark.ROWID)))
-              .set(Bookmark.BOOKMARK_URL, url)
+              .set(Bookmark.BOOKMARK_URL, bookmarkUrl)
           )
         }
       }