diff --git a/src/babel/generation/generators/classes.js b/src/babel/generation/generators/classes.js
index 251b2faf12..ef0b3ae16b 100644
--- a/src/babel/generation/generators/classes.js
+++ b/src/babel/generation/generators/classes.js
@@ -1,8 +1,5 @@
 export function ClassDeclaration(node, print) {
-  if (node.decorators && node.decorators.length) {
-    print.list(node.decorators);
-  }
-
+  print.list(node.decorators);
   this.push("class");
 
   if (node.id) {
@@ -44,10 +41,24 @@ export function ClassBody(node, print) {
   }
 }
 
-export function MethodDefinition(node, print) {
-  if (node.decorators && node.decorators.length) {
-    print.list(node.decorators);
+
+export function ClassProperty(node, print) {
+  print.list(node.decorators);
+
+  if (node.static) this.push("static ");
+  print(node.key);
+  print(node.typeAnnotation);
+  if (node.value) {
+    this.space();
+    this.push("=");
+    this.space();
+    print(node.value);
   }
+  this.semicolon();
+}
+
+export function MethodDefinition(node, print) {
+  print.list(node.decorators);
 
   if (node.static) {
     this.push("static ");
diff --git a/src/babel/generation/generators/flow.js b/src/babel/generation/generators/flow.js
index df9257b02f..7a2e30f4c0 100644
--- a/src/babel/generation/generators/flow.js
+++ b/src/babel/generation/generators/flow.js
@@ -14,13 +14,6 @@ export function BooleanTypeAnnotation(node) {
   this.push("bool");
 }
 
-export function ClassProperty(node, print) {
-  if (node.static) this.push("static ");
-  print(node.key);
-  print(node.typeAnnotation);
-  this.semicolon();
-}
-
 export function DeclareClass(node, print) {
   this.push("declare class ");
   this._interfaceish(node, print);