diff --git a/chrome/content/zotero/overlay.js b/chrome/content/zotero/overlay.js
index 2fa0718c3..c97526aaf 100644
--- a/chrome/content/zotero/overlay.js
+++ b/chrome/content/zotero/overlay.js
@@ -186,14 +186,18 @@ var ZoteroPane = new function()
 		// -- this way the page won't be displayed when they sync their DB to
 		// another profile or if the DB is initialized erroneously (e.g. while
 		// switching data directory locations)
-		else if (Zotero.Prefs.get('firstRun2')
-				&& (Zotero.Schema.dbInitialized || !Zotero.Sync.Server.enabled)) {
-			setTimeout(function () {
-				var url = "http://zotero.org/start";
-				gBrowser.selectedTab = gBrowser.addTab(url);
-			}, 400);
+		else if (Zotero.Prefs.get('firstRun2')) {
+			if (Zotero.Schema.dbInitialized || !Zotero.Sync.Server.enabled) {
+				setTimeout(function () {
+					var url = "http://zotero.org/start";
+					gBrowser.selectedTab = gBrowser.addTab(url);
+				}, 400);
+			}
 			Zotero.Prefs.set('firstRun2', false);
-			Zotero.Prefs.clear('firstRun');
+			try {
+				Zotero.Prefs.clear('firstRun');
+			}
+			catch (e) {}
 		}
 		
 		// Hide sync debugging menu by default