diff --git a/packages/babel-generator/src/generators/expressions.js b/packages/babel-generator/src/generators/expressions.js
index 553b7da970..cc95abd222 100644
--- a/packages/babel-generator/src/generators/expressions.js
+++ b/packages/babel-generator/src/generators/expressions.js
@@ -33,7 +33,9 @@ export function UpdateExpression(node: Object) {
     this.token(node.operator);
     this.print(node.argument, node);
   } else {
+    this.startTerminatorless(true);
     this.print(node.argument, node);
+    this.endTerminatorless();
     this.token(node.operator);
   }
 }
diff --git a/packages/babel-generator/test/fixtures/types/UpdateExpression/actual.js b/packages/babel-generator/test/fixtures/types/UpdateExpression/actual.js
index 0aba7be1a0..f669c83ccf 100644
--- a/packages/babel-generator/test/fixtures/types/UpdateExpression/actual.js
+++ b/packages/babel-generator/test/fixtures/types/UpdateExpression/actual.js
@@ -1,3 +1,4 @@
 ++i;
 i++;
 (foo++).test();
+obj.foo/*comment*/++;
diff --git a/packages/babel-generator/test/fixtures/types/UpdateExpression/expected.js b/packages/babel-generator/test/fixtures/types/UpdateExpression/expected.js
index 314b6664f9..b3776af59c 100644
--- a/packages/babel-generator/test/fixtures/types/UpdateExpression/expected.js
+++ b/packages/babel-generator/test/fixtures/types/UpdateExpression/expected.js
@@ -1,3 +1,4 @@
 ++i;
 i++;
-(foo++).test();
\ No newline at end of file
+(foo++).test();
+obj.foo /*comment*/++;