diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index d4ce6655a21..d91ef73b819 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -610,8 +610,11 @@ namespace ts {
                 // block - scope variable and namespace module. However, only when we
                 // try to resolve name in /*1*/ which is used in variable position,
                 // we want to check for block- scoped
-                if (meaning & SymbolFlags.BlockScopedVariable && result.flags & SymbolFlags.BlockScopedVariable) {
-                    checkResolvedBlockScopedVariable(result, errorLocation);
+                if (meaning & SymbolFlags.BlockScopedVariable) {
+                    const exportOrLocalSymbol = getExportSymbolOfValueSymbolIfExported(result);
+                    if (exportOrLocalSymbol.flags & SymbolFlags.BlockScopedVariable) {
+                        checkResolvedBlockScopedVariable(exportOrLocalSymbol, errorLocation);
+                    }
                 }
             }
             return result;
diff --git a/tests/baselines/reference/exportedBlockScopedDeclarations.errors.txt b/tests/baselines/reference/exportedBlockScopedDeclarations.errors.txt
new file mode 100644
index 00000000000..06d832c86e1
--- /dev/null
+++ b/tests/baselines/reference/exportedBlockScopedDeclarations.errors.txt
@@ -0,0 +1,44 @@
+tests/cases/compiler/exportedBlockScopedDeclarations.ts(1,13): error TS2448: Block-scoped variable 'foo' used before its declaration.
+tests/cases/compiler/exportedBlockScopedDeclarations.ts(2,20): error TS2448: Block-scoped variable 'bar' used before its declaration.
+tests/cases/compiler/exportedBlockScopedDeclarations.ts(4,15): error TS2448: Block-scoped variable 'bar' used before its declaration.
+tests/cases/compiler/exportedBlockScopedDeclarations.ts(7,22): error TS2448: Block-scoped variable 'bar' used before its declaration.
+tests/cases/compiler/exportedBlockScopedDeclarations.ts(10,12): error TS2448: Block-scoped variable 'foo1' used before its declaration.
+tests/cases/compiler/exportedBlockScopedDeclarations.ts(11,19): error TS2448: Block-scoped variable 'bar1' used before its declaration.
+tests/cases/compiler/exportedBlockScopedDeclarations.ts(13,14): error TS2448: Block-scoped variable 'bar1' used before its declaration.
+tests/cases/compiler/exportedBlockScopedDeclarations.ts(16,21): error TS2448: Block-scoped variable 'bar1' used before its declaration.
+
+
+==== tests/cases/compiler/exportedBlockScopedDeclarations.ts (8 errors) ====
+    const foo = foo; // compile error
+                ~~~
+!!! error TS2448: Block-scoped variable 'foo' used before its declaration.
+    export const bar = bar; // should be compile error
+                       ~~~
+!!! error TS2448: Block-scoped variable 'bar' used before its declaration.
+    function f() {
+      const bar = bar; // compile error
+                  ~~~
+!!! error TS2448: Block-scoped variable 'bar' used before its declaration.
+    }
+    namespace NS {
+      export const bar = bar; // should be compile error
+                         ~~~
+!!! error TS2448: Block-scoped variable 'bar' used before its declaration.
+    }
+    
+    let foo1 = foo1; // compile error
+               ~~~~
+!!! error TS2448: Block-scoped variable 'foo1' used before its declaration.
+    export let bar1 = bar1; // should be compile error
+                      ~~~~
+!!! error TS2448: Block-scoped variable 'bar1' used before its declaration.
+    function f1() {
+      let bar1 = bar1; // compile error
+                 ~~~~
+!!! error TS2448: Block-scoped variable 'bar1' used before its declaration.
+    }
+    namespace NS1 {
+      export let bar1 = bar1; // should be compile error
+                        ~~~~
+!!! error TS2448: Block-scoped variable 'bar1' used before its declaration.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/exportedBlockScopedDeclarations.js b/tests/baselines/reference/exportedBlockScopedDeclarations.js
new file mode 100644
index 00000000000..81399ddafb5
--- /dev/null
+++ b/tests/baselines/reference/exportedBlockScopedDeclarations.js
@@ -0,0 +1,40 @@
+//// [exportedBlockScopedDeclarations.ts]
+const foo = foo; // compile error
+export const bar = bar; // should be compile error
+function f() {
+  const bar = bar; // compile error
+}
+namespace NS {
+  export const bar = bar; // should be compile error
+}
+
+let foo1 = foo1; // compile error
+export let bar1 = bar1; // should be compile error
+function f1() {
+  let bar1 = bar1; // compile error
+}
+namespace NS1 {
+  export let bar1 = bar1; // should be compile error
+}
+
+//// [exportedBlockScopedDeclarations.js]
+define(["require", "exports"], function (require, exports) {
+    var foo = foo; // compile error
+    exports.bar = exports.bar; // should be compile error
+    function f() {
+        var bar = bar; // compile error
+    }
+    var NS;
+    (function (NS) {
+        NS.bar = NS.bar; // should be compile error
+    })(NS || (NS = {}));
+    var foo1 = foo1; // compile error
+    exports.bar1 = exports.bar1; // should be compile error
+    function f1() {
+        var bar1 = bar1; // compile error
+    }
+    var NS1;
+    (function (NS1) {
+        NS1.bar1 = NS1.bar1; // should be compile error
+    })(NS1 || (NS1 = {}));
+});
diff --git a/tests/cases/compiler/exportedBlockScopedDeclarations.ts b/tests/cases/compiler/exportedBlockScopedDeclarations.ts
new file mode 100644
index 00000000000..f7a0216e8be
--- /dev/null
+++ b/tests/cases/compiler/exportedBlockScopedDeclarations.ts
@@ -0,0 +1,18 @@
+// @module: amd
+const foo = foo; // compile error
+export const bar = bar; // should be compile error
+function f() {
+  const bar = bar; // compile error
+}
+namespace NS {
+  export const bar = bar; // should be compile error
+}
+
+let foo1 = foo1; // compile error
+export let bar1 = bar1; // should be compile error
+function f1() {
+  let bar1 = bar1; // compile error
+}
+namespace NS1 {
+  export let bar1 = bar1; // should be compile error
+}
\ No newline at end of file