diff --git a/Mac/Preferences/General/GeneralPrefencesViewController.swift b/Mac/Preferences/General/GeneralPrefencesViewController.swift
index 2b906dd2d..912786318 100644
--- a/Mac/Preferences/General/GeneralPrefencesViewController.swift
+++ b/Mac/Preferences/General/GeneralPrefencesViewController.swift
@@ -142,9 +142,9 @@ private extension GeneralPreferencesViewController {
 		let defaultBrowser = MacWebBrowser.default
 
 		let defaultBrowserFormat = NSLocalizedString("System Default (%@)", comment: "Default browser item title format")
-		let defaultBrowserTitle = String(format: defaultBrowserFormat, defaultBrowser.name!)
+		let defaultBrowserTitle = String(format: defaultBrowserFormat, defaultBrowser.name ?? "")
 		let item = NSMenuItem(title: defaultBrowserTitle, action: nil, keyEquivalent: "")
-		let icon = defaultBrowser.icon!
+		let icon = defaultBrowser.icon ?? NSWorkspace.shared.icon(for: UTType.applicationBundle)
 		icon.size = NSSize(width: 16.0, height: 16.0)
 		item.image = icon
 
@@ -163,7 +163,12 @@ private extension GeneralPreferencesViewController {
 			menu.addItem(item)
 		}
 
-		defaultBrowserPopup.selectItem(at: defaultBrowserPopup.indexOfItem(withRepresentedObject: AppDefaults.shared.defaultBrowserID))
+		if let savedID = AppDefaults.shared.defaultBrowserID {
+			let index = defaultBrowserPopup.indexOfItem(withRepresentedObject: savedID)
+			defaultBrowserPopup.selectItem(at: index == -1 ? 0 : index)
+		} else {
+			defaultBrowserPopup.selectItem(at: 0)
+		}
 	}
 
 	func updateNotificationSettings() {
diff --git a/Modules/RSWeb/Sources/RSWeb/MacWebBrowser.swift b/Modules/RSWeb/Sources/RSWeb/MacWebBrowser.swift
index 0db15ed6a..184e1c878 100755
--- a/Modules/RSWeb/Sources/RSWeb/MacWebBrowser.swift
+++ b/Modules/RSWeb/Sources/RSWeb/MacWebBrowser.swift
@@ -51,7 +51,7 @@ import UniformTypeIdentifiers
 
 	/// The filesystem URL of the default web browser.
 	private class var defaultBrowserURL: URL? {
-		return NSWorkspace.shared.urlForApplication(toOpen: URL(string: "https:///")!)
+		return NSWorkspace.shared.urlForApplication(toOpen: URL(string: "https://apple.com/")!)
 	}
 
 	/// The user's default web browser.