diff --git a/Shared/Favicons/FaviconDownloader.swift b/Shared/Favicons/FaviconDownloader.swift
index 0e65d4538..25c83bcc1 100644
--- a/Shared/Favicons/FaviconDownloader.swift
+++ b/Shared/Favicons/FaviconDownloader.swift
@@ -211,21 +211,22 @@ private extension FaviconDownloader {
 		}
 
 		FaviconURLFinder.findFaviconURLs(with: homePageURL) { (faviconURLs) in
+			guard var faviconURLs = faviconURLs else {
+				completion(nil)
+				return
+			}
+
 			var defaultFaviconURL: String? = nil
 
 			if let scheme = url.scheme, let host = url.host {
 				defaultFaviconURL = "\(scheme)://\(host)/favicon.ico".lowercased(with: FaviconDownloader.localeForLowercasing)
 			}
 
-			if var faviconURLs = faviconURLs {
-				if let defaultFaviconURL = defaultFaviconURL {
-					faviconURLs.append(defaultFaviconURL)
-				}
-				completion(faviconURLs)
-				return
+			if let defaultFaviconURL = defaultFaviconURL {
+				faviconURLs.append(defaultFaviconURL)
 			}
 
-			completion(defaultFaviconURL != nil ? [defaultFaviconURL!] : nil)
+			completion(faviconURLs)
 		}
 	}