diff --git a/config/general.prc b/config/general.prc
index 353ea380..a306e7a5 100755
--- a/config/general.prc
+++ b/config/general.prc
@@ -105,6 +105,7 @@ show-total-population #t
 want-mat-all-tailors #t
 want-talkative-tyler #f
 estate-day-night #t
+want-garden-game #f
 want-language-selection #t
 active-holidays 64, 65, 66
 
diff --git a/toontown/estate/DistributedEstate.py b/toontown/estate/DistributedEstate.py
index 5d9becef..b291320e 100755
--- a/toontown/estate/DistributedEstate.py
+++ b/toontown/estate/DistributedEstate.py
@@ -80,6 +80,8 @@ class DistributedEstate(DistributedObject.DistributedObject):
         self.loadFishSellBox()
         self.oldClear = base.win.getClearColor()
         base.win.setClearColor(Vec4(0.09, 0.55, 0.21, 1.0))
+        if config.GetBool('want-garden-game', False):
+            self.startGame()
 
     def unload(self):
         self.ignoreAll()
@@ -110,6 +112,8 @@ class DistributedEstate(DistributedObject.DistributedObject):
             self.fishSellBox.removeNode()
             del self.fishSellBox
             self.fishSellBox = None
+        if config.GetBool('want-garden-game', False):
+            GardenDropGame.GardenDropGame().endGame()
         return
 
     def announceGenerate(self):
@@ -117,7 +121,10 @@ class DistributedEstate(DistributedObject.DistributedObject):
         self.accept('gardenGame', self.startGame)
 
     def startGame(self):
-        self.game = GardenDropGame.GardenDropGame()
+        if config.GetBool('want-garden-game', False):
+            self.game = GardenDropGame.GardenDropGame().playGardenDrop()
+        else:
+            self.game = GardenDropGame.GardenDropGame()
 
     def loadAirplane(self):
         self.airplane = loader.loadModel('phase_4/models/props/airplane.bam')