diff --git a/toontown/ai/NewsManager.py b/toontown/ai/NewsManager.py
index fe7cd551..f40a4e0d 100644
--- a/toontown/ai/NewsManager.py
+++ b/toontown/ai/NewsManager.py
@@ -549,7 +549,7 @@ class NewsManager(DistributedObject.DistributedObject):
     
     def setLaughingManHolidayEnd(self):
         for currToon in base.cr.toons.values():
-            currToon.swapToonHead(laughingMan=False)
+            currToon.swapToonHead(laughingMan=currToon.getWantLaughingMan())
     
     def setTopToonsMarathonStart(self):
         base.localAvatar.setSystemMessage(0, TTLocalizer.TopToonsMarathonStart)
diff --git a/toontown/toon/Toon.py b/toontown/toon/Toon.py
index 13a5a4e7..61f28622 100644
--- a/toontown/toon/Toon.py
+++ b/toontown/toon/Toon.py
@@ -828,7 +828,7 @@ class Toon(Avatar.Avatar, ToonHead):
         if headStyle > -1:
             self.style.head = headStyle
         if laughingMan > -1:
-            self.style.laughingMan = laughingMan
+            self.style.laughingMan = True if laughingMan else self.getWantLaughingMan()
         self.generateToonHead(copy)
         self.generateToonColor()
         self.parentToonParts()