diff --git a/mozilla/browser/components/nsBrowserContentHandler.js b/mozilla/browser/components/nsBrowserContentHandler.js
index 09931d249e4..a6b8a2e7d4c 100644
--- a/mozilla/browser/components/nsBrowserContentHandler.js
+++ b/mozilla/browser/components/nsBrowserContentHandler.js
@@ -367,6 +367,13 @@ var nsBrowserContentHandler = {
 
     var uri = prefb.getComplexValue("browser.startup.homepage",
                                     nsIPrefLocalizedString).data;
+
+    if (!uri) {
+      prefb.clearUserPref("browser.startup.homepage");
+      uri = prefb.getComplexValue("browser.startup.homepage",
+                                  nsIPrefLocalizedString).data;
+    }
+                                
     var count;
     try {
       count = prefb.getIntPref("browser.startup.homepage.count");