diff --git a/src/variables.rs b/src/variables.rs
index d60e18c6da..8066ef3940 100644
--- a/src/variables.rs
+++ b/src/variables.rs
@@ -16,7 +16,7 @@ impl<'expression, 'src> Iterator for Variables<'expression, 'src> {
   fn next(&mut self) -> Option<Token<'src>> {
     loop {
       match self.stack.pop()? {
-        Expression::And { lhs, rhs } => {
+        Expression::And { lhs, rhs } | Expression::Or { lhs, rhs } => {
           self.stack.push(lhs);
           self.stack.push(rhs);
         }
@@ -86,10 +86,6 @@ impl<'expression, 'src> Iterator for Variables<'expression, 'src> {
             self.stack.push(lhs);
           }
         }
-        Expression::Or { lhs, rhs } => {
-          self.stack.push(lhs);
-          self.stack.push(rhs);
-        }
         Expression::Group { contents } => {
           self.stack.push(contents);
         }