diff --git a/packages/babel-generator/src/buffer.js b/packages/babel-generator/src/buffer.js
index 2f778535d8..204641d60d 100644
--- a/packages/babel-generator/src/buffer.js
+++ b/packages/babel-generator/src/buffer.js
@@ -124,10 +124,10 @@ export default class Buffer {
    * Add a space to the buffer unless it is compact.
    */
 
-  space() {
+  space(force: boolean = false) {
     if (this.format.compact) return;
 
-    if (this.buf && !this.endsWith(" ") && !this.endsWith("\n")) {
+    if ((this.buf && !this.endsWith(" ") && !this.endsWith("\n")) || force) {
       this.push(" ");
     }
   }
diff --git a/packages/babel-generator/src/generators/statements.js b/packages/babel-generator/src/generators/statements.js
index 38044cacbe..e4aa15fd50 100644
--- a/packages/babel-generator/src/generators/statements.js
+++ b/packages/babel-generator/src/generators/statements.js
@@ -209,14 +209,14 @@ function variableDeclarationIdent() {
   // "let " or "var " indentation.
   this.token(",");
   this.newline();
-  for (let i = 0; i < 4; i++) this.push(" ");
+  for (let i = 0; i < 4; i++) this.space(true);
 }
 
 function constDeclarationIdent() {
   // "const " indentation.
   this.token(",");
   this.newline();
-  for (let i = 0; i < 6; i++) this.push(" ");
+  for (let i = 0; i < 6; i++) this.space(true);
 }
 
 export function VariableDeclaration(node: Object, parent: Object) {