diff --git a/vyper/codegen/stmt.py b/vyper/codegen/stmt.py
index c2951986c8..254cad32e6 100644
--- a/vyper/codegen/stmt.py
+++ b/vyper/codegen/stmt.py
@@ -91,17 +91,15 @@ def parse_Assign(self):
         return IRnode.from_list(ret)
 
     def parse_If(self):
+        with self.context.block_scope():
+            test_expr = Expr.parse_value_expr(self.stmt.test, self.context)
+            body = ["if", test_expr, parse_body(self.stmt.body, self.context)]
+
         if self.stmt.orelse:
             with self.context.block_scope():
-                add_on = [parse_body(self.stmt.orelse, self.context)]
-        else:
-            add_on = []
+                body.extend([parse_body(self.stmt.orelse, self.context)])
 
-        with self.context.block_scope():
-            test_expr = Expr.parse_value_expr(self.stmt.test, self.context)
-            body = ["if", test_expr, parse_body(self.stmt.body, self.context)] + add_on
-            ir_node = IRnode.from_list(body)
-        return ir_node
+        return IRnode.from_list(body)
 
     def parse_Log(self):
         event = self.stmt._metadata["type"]