diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/ChromiumBookmarkLoader.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/ChromiumBookmarkLoader.cs
index 8fb04d252..aed13c858 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/ChromiumBookmarkLoader.cs
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/ChromiumBookmarkLoader.cs
@@ -171,21 +171,21 @@ public abstract class ChromiumBookmarkLoader : IBookmarkLoader
                         cmd.Parameters.AddWithValue("@url", $"%{domain}%");
 
                         using var reader = cmd.ExecuteReader();
-                        if (reader.Read() && !reader.IsDBNull(1))
-                        {
-                            var iconId = reader.GetInt64(0).ToString();
-                            var imageData = (byte[])reader["image_data"];
+                        if (!reader.Read() || reader.IsDBNull(1))
+                            continue;
 
-                            if (imageData != null && imageData.Length > 0)
-                            {
-                                var faviconPath = Path.Combine(_faviconCacheDir, $"{domain}_{iconId}.png");
-                                if (!File.Exists(faviconPath))
-                                {
-                                    SaveBitmapData(imageData, faviconPath);
-                                }
-                                bookmark.FaviconPath = faviconPath;
-                            }
+                        var iconId = reader.GetInt64(0).ToString();
+                        var imageData = (byte[])reader["image_data"];
+
+                        if (imageData is not { Length: > 0 })
+                            continue;
+
+                        var faviconPath = Path.Combine(_faviconCacheDir, $"{domain}_{iconId}.png");
+                        if (!File.Exists(faviconPath))
+                        {
+                            SaveBitmapData(imageData, faviconPath);
                         }
+                        bookmark.FaviconPath = faviconPath;
                     }
                     catch (Exception ex)
                     {
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/FirefoxBookmarkLoader.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/FirefoxBookmarkLoader.cs
index da7780acb..7851214e9 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/FirefoxBookmarkLoader.cs
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/FirefoxBookmarkLoader.cs
@@ -145,22 +145,23 @@ public abstract class FirefoxBookmarkLoaderBase : IBookmarkLoader
                     cmd.Parameters.AddWithValue("@url", $"%{domain}%");
 
                     using var reader = cmd.ExecuteReader();
-                    if (reader.Read() && !reader.IsDBNull(0))
+                    if (!reader.Read() || reader.IsDBNull(0))
+                        continue;
+
+                    var imageData = (byte[])reader["data"];
+
+                    if (imageData is not { Length: > 0 })
+                        continue;
+
+                    var ext = IsSvgData(imageData) ? "svg" : "png";
+                    var faviconPath = Path.Combine(_faviconCacheDir, $"firefox_{domain}.{ext}");
+
+                    if (!File.Exists(faviconPath))
                     {
-                        var imageData = (byte[])reader["data"];
-
-                        if (imageData != null && imageData.Length > 0)
-                        {
-                            var ext = IsSvgData(imageData) ? "svg" : "png";
-                            var faviconPath = Path.Combine(_faviconCacheDir, $"firefox_{domain}.{ext}");
-
-                            if (!File.Exists(faviconPath))
-                            {
-                                SaveBitmapData(imageData, faviconPath);
-                            }
-                            bookmark.FaviconPath = faviconPath;
-                        }
+                        SaveBitmapData(imageData, faviconPath);
                     }
+
+                    bookmark.FaviconPath = faviconPath;
                 }
                 catch (Exception ex)
                 {