diff --git a/src/services/refactors/convertArrowFunctionOrFunctionExpression.ts b/src/services/refactors/convertArrowFunctionOrFunctionExpression.ts
index 3098fe3c6a4..0843ddea79b 100644
--- a/src/services/refactors/convertArrowFunctionOrFunctionExpression.ts
+++ b/src/services/refactors/convertArrowFunctionOrFunctionExpression.ts
@@ -172,7 +172,7 @@ namespace ts.refactor.convertArrowFunctionOrFunctionExpression {
         const head = statements[0];
         let body: ConciseBody;
 
-        if (func.body.statements.length === 1 && (isReturnStatement(head) || isExpressionStatement(head))) {
+        if (func.body.statements.length === 1 && ((isReturnStatement(head) && !!head.expression) || isExpressionStatement(head))) {
             body = head.expression!;
             suppressLeadingAndTrailingTrivia(body);
             copyComments(head, body, file, SyntaxKind.MultiLineCommentTrivia, /* hasTrailingNewLine */ false);
diff --git a/tests/cases/fourslash/refactorConvertArrowFunctionOrFunctionExpression_Availability_Anon.ts b/tests/cases/fourslash/refactorConvertArrowFunctionOrFunctionExpression_Availability_Anon.ts
index 452d2ecd043..0fa3222617c 100644
--- a/tests/cases/fourslash/refactorConvertArrowFunctionOrFunctionExpression_Availability_Anon.ts
+++ b/tests/cases/fourslash/refactorConvertArrowFunctionOrFunctionExpression_Availability_Anon.ts
@@ -25,4 +25,4 @@ verify.not.refactorAvailable("Convert arrow function or function expression", "C
 goTo.select("r", "q");
 verify.not.refactorAvailable("Convert arrow function or function expression", "Convert to named function");
 verify.not.refactorAvailable("Convert arrow function or function expression", "Convert to anonymous function");
-verify.not.refactorAvailable("Convert arrow function or function expression", "Convert to arrow function");
\ No newline at end of file
+verify.not.refactorAvailable("Convert arrow function or function expression", "Convert to arrow function");
diff --git a/tests/cases/fourslash/refactorConvertArrowFunctionOrFunctionExpression_Availability_Anon_FnParam.ts b/tests/cases/fourslash/refactorConvertArrowFunctionOrFunctionExpression_Availability_Anon_FnParam.ts
index 8285478a574..6c017aeeb73 100644
--- a/tests/cases/fourslash/refactorConvertArrowFunctionOrFunctionExpression_Availability_Anon_FnParam.ts
+++ b/tests/cases/fourslash/refactorConvertArrowFunctionOrFunctionExpression_Availability_Anon_FnParam.ts
@@ -31,4 +31,4 @@ verify.refactorAvailable("Convert arrow function or function expression", "Conve
 goTo.select("p", "o");
 verify.not.refactorAvailable("Convert arrow function or function expression", "Convert to named function");
 verify.not.refactorAvailable("Convert arrow function or function expression", "Convert to anonymous function");
-verify.not.refactorAvailable("Convert arrow function or function expression", "Convert to arrow function");
\ No newline at end of file
+verify.not.refactorAvailable("Convert arrow function or function expression", "Convert to arrow function");
diff --git a/tests/cases/fourslash/refactorConvertArrowFunctionOrFunctionExpression_Availability_Arrow.ts b/tests/cases/fourslash/refactorConvertArrowFunctionOrFunctionExpression_Availability_Arrow.ts
index 673b49ef703..619b2af822c 100644
--- a/tests/cases/fourslash/refactorConvertArrowFunctionOrFunctionExpression_Availability_Arrow.ts
+++ b/tests/cases/fourslash/refactorConvertArrowFunctionOrFunctionExpression_Availability_Arrow.ts
@@ -30,4 +30,4 @@ verify.not.refactorAvailable("Convert arrow function or function expression", "C
 goTo.select("p", "o");
 verify.not.refactorAvailable("Convert arrow function or function expression", "Convert to named function");
 verify.not.refactorAvailable("Convert arrow function or function expression", "Convert to anonymous function");
-verify.not.refactorAvailable("Convert arrow function or function expression", "Convert to arrow function");
\ No newline at end of file
+verify.not.refactorAvailable("Convert arrow function or function expression", "Convert to arrow function");
diff --git a/tests/cases/fourslash/refactorConvertArrowFunctionOrFunctionExpression_Availability_Arrow_FnParam.ts b/tests/cases/fourslash/refactorConvertArrowFunctionOrFunctionExpression_Availability_Arrow_FnParam.ts
index 75ffddeb39a..6d309494da9 100644
--- a/tests/cases/fourslash/refactorConvertArrowFunctionOrFunctionExpression_Availability_Arrow_FnParam.ts
+++ b/tests/cases/fourslash/refactorConvertArrowFunctionOrFunctionExpression_Availability_Arrow_FnParam.ts
@@ -27,4 +27,4 @@ verify.not.refactorAvailable("Convert arrow function or function expression", "C
 goTo.select("r", "q");
 verify.not.refactorAvailable("Convert arrow function or function expression", "Convert to named function");
 verify.not.refactorAvailable("Convert arrow function or function expression", "Convert to anonymous function");
-verify.not.refactorAvailable("Convert arrow function or function expression", "Convert to arrow function");
\ No newline at end of file
+verify.not.refactorAvailable("Convert arrow function or function expression", "Convert to arrow function");
diff --git a/tests/cases/fourslash/refactorConvertArrowFunctionOrFunctionExpression_Availability_Arrow_MultiDecl.ts b/tests/cases/fourslash/refactorConvertArrowFunctionOrFunctionExpression_Availability_Arrow_MultiDecl.ts
index 1cff8b487d5..1e87f8bc0c3 100644
--- a/tests/cases/fourslash/refactorConvertArrowFunctionOrFunctionExpression_Availability_Arrow_MultiDecl.ts
+++ b/tests/cases/fourslash/refactorConvertArrowFunctionOrFunctionExpression_Availability_Arrow_MultiDecl.ts
@@ -20,4 +20,4 @@ verify.not.refactorAvailable("Convert arrow function or function expression", "C
 goTo.select("t", "s");
 verify.refactorAvailable("Convert arrow function or function expression", "Convert to named function");
 verify.refactorAvailable("Convert arrow function or function expression", "Convert to anonymous function");
-verify.not.refactorAvailable("Convert arrow function or function expression", "Convert to arrow function");
\ No newline at end of file
+verify.not.refactorAvailable("Convert arrow function or function expression", "Convert to arrow function");
diff --git a/tests/cases/fourslash/refactorConvertArrowFunctionOrFunctionExpression_ToArrow_EmptyReturn.ts b/tests/cases/fourslash/refactorConvertArrowFunctionOrFunctionExpression_ToArrow_EmptyReturn.ts
new file mode 100644
index 00000000000..e77adca0eb8
--- /dev/null
+++ b/tests/cases/fourslash/refactorConvertArrowFunctionOrFunctionExpression_ToArrow_EmptyReturn.ts
@@ -0,0 +1,15 @@
+/// <reference path='fourslash.ts' />
+
+//// const foo = /*x*/f/*y*/unction() {
+////    return;
+//// };
+
+goTo.select("x", "y");
+edit.applyRefactor({
+    refactorName: "Convert arrow function or function expression",
+    actionName: "Convert to arrow function",
+    actionDescription: "Convert to arrow function",
+    newContent: `const foo = () => {
+    return;
+};`,
+});