diff --git a/CookieMonster.js b/CookieMonster.js
index 49d8928..7ba14d7 100644
--- a/CookieMonster.js
+++ b/CookieMonster.js
@@ -1894,7 +1894,7 @@ CM.Disp.CreateFavicon = function() {
  * By relying on CM.Cache.spawnedGoldenShimmer it only changes for non-user spawned cookie
  */
 CM.Disp.UpdateFavicon = function() {
-	if (CM.Config.Favicon == 1) {
+	if (CM.Config.Favicon == 1 && CM.Main.lastGoldenCookieState > 0) {
 		if (CM.Cache.spawnedGoldenShimmer.wrath) CM.Disp.Favicon.href = 'https://aktanusa.github.io/CookieMonster/favicon/wrathCookie.ico';
 		else CM.Disp.Favicon.href = 'https://aktanusa.github.io/CookieMonster/favicon/goldenCookie.ico';
 	}
@@ -3784,7 +3784,6 @@ CM.Main.CheckGoldenCookie = function() {
 				CM.Disp.PlaySound(CM.Config.GCSoundURL, 'GCSound', 'GCVolume');
 				CM.Disp.Notification('GCNotification', "Golden Cookie Spawned", "A Golden Cookie has spawned. Click it now!")
 			}
-			CM.Disp.UpdateFavicon();
 			
 			for (var i in Game.shimmers) {
 				if (typeof CM.Disp.GCTimers[Game.shimmers[i].id] == "undefined") {
@@ -3792,7 +3791,8 @@ CM.Main.CheckGoldenCookie = function() {
 				}
 			}
 		}
-		CM.Main.lastSpawnedGoldenCookieState = CM.Main.currSpawnedGoldenCookieState
+		CM.Disp.UpdateFavicon();
+		CM.Main.lastSpawnedGoldenCookieState = CM.Main.currSpawnedGoldenCookieState;
 		if (CM.Main.currSpawnedGoldenCookieState == 0) CM.Cache.spawnedGoldenShimmer = 0;
 	}
 	else if (CM.Config.GCTimer == 1 && CM.Main.lastGoldenCookieState) {
diff --git a/src/Disp.js b/src/Disp.js
index 7816777..ec02a1e 100644
--- a/src/Disp.js
+++ b/src/Disp.js
@@ -1006,7 +1006,7 @@ CM.Disp.CreateFavicon = function() {
  * By relying on CM.Cache.spawnedGoldenShimmer it only changes for non-user spawned cookie
  */
 CM.Disp.UpdateFavicon = function() {
-	if (CM.Config.Favicon == 1) {
+	if (CM.Config.Favicon == 1 && CM.Main.lastGoldenCookieState > 0) {
 		if (CM.Cache.spawnedGoldenShimmer.wrath) CM.Disp.Favicon.href = 'https://aktanusa.github.io/CookieMonster/favicon/wrathCookie.ico';
 		else CM.Disp.Favicon.href = 'https://aktanusa.github.io/CookieMonster/favicon/goldenCookie.ico';
 	}
diff --git a/src/Main.js b/src/Main.js
index 3b336d7..23519fa 100644
--- a/src/Main.js
+++ b/src/Main.js
@@ -305,7 +305,6 @@ CM.Main.CheckGoldenCookie = function() {
 				CM.Disp.PlaySound(CM.Config.GCSoundURL, 'GCSound', 'GCVolume');
 				CM.Disp.Notification('GCNotification', "Golden Cookie Spawned", "A Golden Cookie has spawned. Click it now!")
 			}
-			CM.Disp.UpdateFavicon();
 			
 			for (var i in Game.shimmers) {
 				if (typeof CM.Disp.GCTimers[Game.shimmers[i].id] == "undefined") {
@@ -313,7 +312,8 @@ CM.Main.CheckGoldenCookie = function() {
 				}
 			}
 		}
-		CM.Main.lastSpawnedGoldenCookieState = CM.Main.currSpawnedGoldenCookieState
+		CM.Disp.UpdateFavicon();
+		CM.Main.lastSpawnedGoldenCookieState = CM.Main.currSpawnedGoldenCookieState;
 		if (CM.Main.currSpawnedGoldenCookieState == 0) CM.Cache.spawnedGoldenShimmer = 0;
 	}
 	else if (CM.Config.GCTimer == 1 && CM.Main.lastGoldenCookieState) {