diff --git a/Yesod/Handler.hs b/Yesod/Handler.hs
index 19d4941d..9346bca6 100644
--- a/Yesod/Handler.hs
+++ b/Yesod/Handler.hs
@@ -748,7 +748,10 @@ headerToPair cp getExpires (AddCookie minutes key value) =
         { setCookieName = key
         , setCookieValue = value
         , setCookiePath = Just cp
-        , setCookieExpires = Just $ getExpires minutes
+        , setCookieExpires =
+            if minutes == 0
+                then Nothing
+                else Just $ getExpires minutes
         , setCookieDomain = Nothing
         })
 headerToPair cp _ (DeleteCookie key) =