diff --git a/bakery.module b/bakery.module
index 7191283..babfb77 100644
--- a/bakery.module
+++ b/bakery.module
@@ -995,8 +995,10 @@ function _bakery_taste_chocolatechip_cookie() {
       bakery_user_logout();
     }
 
-    // Bake a fresh cookie. Yum.
-    _bakery_bake_chocolatechip_cookie($cookie['name'], $cookie['mail'], $cookie['init']);
+    // Bake a fresh cookie if this is the master site.
+    if (variable_get('bakery_is_master', 0)) {
+      _bakery_bake_chocolatechip_cookie($cookie['name'], $cookie['mail'], $cookie['init']);
+    }
 
     if (!$user->uid) {
       // Since this might happen in hook_boot we need to bootstrap first.