diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 139f3f052cb..a944918f9a3 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -10372,7 +10372,7 @@ namespace ts {
             // the entire control flow graph from the variable's declaration (i.e. when the flow container and
             // declaration container are the same).
             const assumeInitialized = isParameter || isOuterVariable ||
-                type !== autoType && type !== autoArrayType && (!strictNullChecks || (type.flags & TypeFlags.Any) !== 0) ||
+                type !== autoType && type !== autoArrayType && (!strictNullChecks || (type.flags & TypeFlags.Any) !== 0 || isInTypeQuery(node)) ||
                 isInAmbientContext(declaration);
             const flowType = getFlowTypeOfReference(node, type, assumeInitialized, flowContainer);
             // A variable is considered uninitialized when it is possible to analyze the entire control flow graph
diff --git a/tests/baselines/reference/typeofStrictNull.js b/tests/baselines/reference/typeofStrictNull.js
new file mode 100644
index 00000000000..520a72b9f0f
--- /dev/null
+++ b/tests/baselines/reference/typeofStrictNull.js
@@ -0,0 +1,8 @@
+//// [typeofStrictNull.ts]
+
+let a: number;
+let b: typeof a;
+
+//// [typeofStrictNull.js]
+var a;
+var b;
diff --git a/tests/baselines/reference/typeofStrictNull.symbols b/tests/baselines/reference/typeofStrictNull.symbols
new file mode 100644
index 00000000000..7b2dfb41797
--- /dev/null
+++ b/tests/baselines/reference/typeofStrictNull.symbols
@@ -0,0 +1,9 @@
+=== tests/cases/compiler/typeofStrictNull.ts ===
+
+let a: number;
+>a : Symbol(a, Decl(typeofStrictNull.ts, 1, 3))
+
+let b: typeof a;
+>b : Symbol(b, Decl(typeofStrictNull.ts, 2, 3))
+>a : Symbol(a, Decl(typeofStrictNull.ts, 1, 3))
+
diff --git a/tests/baselines/reference/typeofStrictNull.types b/tests/baselines/reference/typeofStrictNull.types
new file mode 100644
index 00000000000..59344727987
--- /dev/null
+++ b/tests/baselines/reference/typeofStrictNull.types
@@ -0,0 +1,9 @@
+=== tests/cases/compiler/typeofStrictNull.ts ===
+
+let a: number;
+>a : number
+
+let b: typeof a;
+>b : number
+>a : number
+
diff --git a/tests/cases/compiler/typeofStrictNull.ts b/tests/cases/compiler/typeofStrictNull.ts
new file mode 100644
index 00000000000..ede2b857305
--- /dev/null
+++ b/tests/cases/compiler/typeofStrictNull.ts
@@ -0,0 +1,4 @@
+// @strictNullChecks: true
+
+let a: number;
+let b: typeof a;
\ No newline at end of file