diff --git a/.eslintrc b/.eslintrc
index 966f58e82e3..bef1efdd3e6 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -82,7 +82,7 @@
         "no-debugger": "off",
         "no-duplicate-case": "error",
         "no-duplicate-imports": "error",
-        "no-empty": "off",
+        "no-empty": "error",
         "no-eval": "off",
         "no-extra-bind": "error",
         "no-fallthrough": "off",
diff --git a/src/compiler/builder.ts b/src/compiler/builder.ts
index d4c2132d36b..066db100983 100644
--- a/src/compiler/builder.ts
+++ b/src/compiler/builder.ts
@@ -957,7 +957,7 @@ namespace ts {
 
             // When semantic builder asks for diagnostics of the whole program,
             // ensure that all the affected files are handled
-            // tslint:disable-next-line no-empty
+            // eslint-disable-next-line no-empty
             while (getSemanticDiagnosticsOfNextAffectedFile(cancellationToken)) {
             }
 
diff --git a/src/server/session.ts b/src/server/session.ts
index 2e9d6948b1a..90c8fbdea9f 100644
--- a/src/server/session.ts
+++ b/src/server/session.ts
@@ -669,7 +669,7 @@ namespace ts.server {
                             msg += `\n\nFile text of ${fileRequest.file}:${indent(text)}\n`;
                         }
                     }
-                    catch { } // tslint:disable-line no-empty
+                    catch { } // eslint-disable-line no-empty
                 }
 
                 if (err.message && err.message.indexOf(`Could not find sourceFile:`) !== -1) {
diff --git a/src/testRunner/unittests/builder.ts b/src/testRunner/unittests/builder.ts
index 709222a4dff..962ee037f87 100644
--- a/src/testRunner/unittests/builder.ts
+++ b/src/testRunner/unittests/builder.ts
@@ -78,7 +78,7 @@ namespace ts {
             const program = getProgram();
             builderProgram = createEmitAndSemanticDiagnosticsBuilderProgram(program, host, builderProgram);
             const outputFileNames: string[] = [];
-            // tslint:disable-next-line no-empty
+            // eslint-disable-next-line no-empty
             while (builderProgram.emitNextAffectedFile(fileName => outputFileNames.push(fileName))) {
             }
             assert.deepEqual(outputFileNames, fileNames);