diff --git a/src/potion.c b/src/potion.c
index 68e6c8304..114e7fbfa 100644
--- a/src/potion.c
+++ b/src/potion.c
@@ -795,8 +795,9 @@ dodrink()
                 quan++;
             }
             You("down the entire keg! You are incredibly drunk!");
-            if (quan > 5 && !maybe_polyd(is_dwarf(youmonst.data) || is_giant(youmonst.data), 
-                Race_if(PM_DWARF))) {
+            if (quan > 5
+                && !maybe_polyd(is_dwarf(youmonst.data), Race_if(PM_DWARF))
+                && !maybe_polyd(is_giant(youmonst.data), Race_if(PM_GIANT))) {
                 u.uhp = 0;
                 losehp(1, "drinking too much booze", KILLED_BY);
             }