diff --git a/src/services/codefixes/convertToEs6Module.ts b/src/services/codefixes/convertToEs6Module.ts
index 8ffba3218c0..a8df21dc96d 100644
--- a/src/services/codefixes/convertToEs6Module.ts
+++ b/src/services/codefixes/convertToEs6Module.ts
@@ -130,23 +130,23 @@ namespace ts.codefix {
         let foundImport = false;
         const newNodes = flatMap(declarationList.declarations, decl => {
             const { name, initializer } = decl;
-            if (isExportsOrModuleExportsOrAlias(sourceFile, initializer)) {
-                // `const alias = module.exports;` can be removed.
-                foundImport = true;
-                return [];
-            }
-            if (isRequireCall(initializer, /*checkArgumentIsStringLiteralLike*/ true)) {
-                foundImport = true;
-                return convertSingleImport(sourceFile, name, initializer.arguments[0], changes, checker, identifiers, target);
-            }
-            else if (isPropertyAccessExpression(initializer) && isRequireCall(initializer.expression, /*checkArgumentIsStringLiteralLike*/ true)) {
-                foundImport = true;
-                return convertPropertyAccessImport(name, initializer.name.text, initializer.expression.arguments[0], identifiers);
-            }
-            else {
-                // Move it out to its own variable statement. (This will not be used if `!foundImport`)
-                return createVariableStatement(/*modifiers*/ undefined, createVariableDeclarationList([decl], declarationList.flags));
+            if (initializer) {
+                if (isExportsOrModuleExportsOrAlias(sourceFile, initializer)) {
+                    // `const alias = module.exports;` can be removed.
+                    foundImport = true;
+                    return [];
+                }
+                else if (isRequireCall(initializer, /*checkArgumentIsStringLiteralLike*/ true)) {
+                    foundImport = true;
+                    return convertSingleImport(sourceFile, name, initializer.arguments[0], changes, checker, identifiers, target);
+                }
+                else if (isPropertyAccessExpression(initializer) && isRequireCall(initializer.expression, /*checkArgumentIsStringLiteralLike*/ true)) {
+                    foundImport = true;
+                    return convertPropertyAccessImport(name, initializer.name.text, initializer.expression.arguments[0], identifiers);
+                }
             }
+            // Move it out to its own variable statement. (This will not be used if `!foundImport`)
+            return createVariableStatement(/*modifiers*/ undefined, createVariableDeclarationList([decl], declarationList.flags));
         });
         if (foundImport) {
             // useNonAdjustedEndPosition to ensure we don't eat the newline after the statement.
diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_missingInitializer.ts b/tests/cases/fourslash/refactorConvertToEs6Module_missingInitializer.ts
new file mode 100644
index 00000000000..77c4ce0fc43
--- /dev/null
+++ b/tests/cases/fourslash/refactorConvertToEs6Module_missingInitializer.ts
@@ -0,0 +1,14 @@
+/// <reference path='fourslash.ts' />
+
+// @allowJs: true
+
+// @Filename: /a.js
+////require("m");
+////let x; x;
+
+verify.codeFix({
+    description: "Convert to ES6 module",
+    newFileContent:
+`import "m";
+let x; x;`
+});