diff --git a/geometry.dtx b/geometry.dtx
index 3750935..40a2731 100644
--- a/geometry.dtx
+++ b/geometry.dtx
@@ -2321,11 +2321,13 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex.
     \let\Gm@hscale\@undefined
     \let\Gm@width\@undefined
     \let\Gm@textwidth\@undefined
+    \Gm@hbodyfalse
   \fi
   \ifGm@vbody\else
     \let\Gm@vscale\@undefined
     \let\Gm@height\@undefined
     \let\Gm@textheight\@undefined
+    \Gm@vbodyfalse
   \fi
   }%
 %    \end{macrocode}