diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 2e900f3b6ce..b40acf0ea06 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -2524,6 +2524,9 @@ module ts {
             else if (type.flags & TypeFlags.Boolean) {
                 type = globalBooleanType;
             }
+            else if (type.flags & TypeFlags.ESSymbol) {
+                type = globalESSymbolType;
+            }
             return type;
         }
 
diff --git a/tests/baselines/reference/symbolType11.types b/tests/baselines/reference/symbolType11.types
index ba3a2fec364..21de110854c 100644
--- a/tests/baselines/reference/symbolType11.types
+++ b/tests/baselines/reference/symbolType11.types
@@ -30,7 +30,7 @@ s || 1;
 >s : symbol
 
 ({}) || s;
->({}) || s : symbol | {}
+>({}) || s : {}
 >({}) : {}
 >{} : {}
 >s : symbol
diff --git a/tests/baselines/reference/symbolType15.errors.txt b/tests/baselines/reference/symbolType15.errors.txt
new file mode 100644
index 00000000000..eb63e5798d5
--- /dev/null
+++ b/tests/baselines/reference/symbolType15.errors.txt
@@ -0,0 +1,11 @@
+tests/cases/conformance/es6/Symbols/symbolType15.ts(5,1): error TS2322: Type 'Symbol' is not assignable to type 'symbol'.
+
+
+==== tests/cases/conformance/es6/Symbols/symbolType15.ts (1 errors) ====
+    var sym: symbol;
+    var symObj: Symbol;
+    
+    symObj = sym;
+    sym = symObj;
+    ~~~
+!!! error TS2322: Type 'Symbol' is not assignable to type 'symbol'.
\ No newline at end of file
diff --git a/tests/baselines/reference/symbolType15.js b/tests/baselines/reference/symbolType15.js
new file mode 100644
index 00000000000..1c3519d603e
--- /dev/null
+++ b/tests/baselines/reference/symbolType15.js
@@ -0,0 +1,12 @@
+//// [symbolType15.ts]
+var sym: symbol;
+var symObj: Symbol;
+
+symObj = sym;
+sym = symObj;
+
+//// [symbolType15.js]
+var sym;
+var symObj;
+symObj = sym;
+sym = symObj;
diff --git a/tests/baselines/reference/symbolType16.js b/tests/baselines/reference/symbolType16.js
new file mode 100644
index 00000000000..65a95dd8365
--- /dev/null
+++ b/tests/baselines/reference/symbolType16.js
@@ -0,0 +1,11 @@
+//// [symbolType16.ts]
+interface Symbol {
+    newSymbolProp: number;
+}
+
+var sym: symbol;
+sym.newSymbolProp;
+
+//// [symbolType16.js]
+var sym;
+sym.newSymbolProp;
diff --git a/tests/baselines/reference/symbolType16.types b/tests/baselines/reference/symbolType16.types
new file mode 100644
index 00000000000..91fdc9978da
--- /dev/null
+++ b/tests/baselines/reference/symbolType16.types
@@ -0,0 +1,16 @@
+=== tests/cases/conformance/es6/Symbols/symbolType16.ts ===
+interface Symbol {
+>Symbol : Symbol
+
+    newSymbolProp: number;
+>newSymbolProp : number
+}
+
+var sym: symbol;
+>sym : symbol
+
+sym.newSymbolProp;
+>sym.newSymbolProp : number
+>sym : symbol
+>newSymbolProp : number
+
diff --git a/tests/cases/conformance/es6/Symbols/symbolType15.ts b/tests/cases/conformance/es6/Symbols/symbolType15.ts
new file mode 100644
index 00000000000..22f1f9662c0
--- /dev/null
+++ b/tests/cases/conformance/es6/Symbols/symbolType15.ts
@@ -0,0 +1,6 @@
+//@target: ES6
+var sym: symbol;
+var symObj: Symbol;
+
+symObj = sym;
+sym = symObj;
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/Symbols/symbolType16.ts b/tests/cases/conformance/es6/Symbols/symbolType16.ts
new file mode 100644
index 00000000000..0421e0ccc02
--- /dev/null
+++ b/tests/cases/conformance/es6/Symbols/symbolType16.ts
@@ -0,0 +1,7 @@
+//@target: ES6
+interface Symbol {
+    newSymbolProp: number;
+}
+
+var sym: symbol;
+sym.newSymbolProp;
\ No newline at end of file