diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 0a45b61660a1f..0cc0ebab32099 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -13918,12 +13918,7 @@ namespace ts {
                 checkSignatureDeclaration(node);
                 if (node.kind === SyntaxKind.GetAccessor) {
                     if (!isInAmbientContext(node) && nodeIsPresent(node.body) && (node.flags & NodeFlags.HasImplicitReturn)) {
-                        if (node.flags & NodeFlags.HasExplicitReturn) {
-                            if (compilerOptions.noImplicitReturns) {
-                                error(node.name, Diagnostics.Not_all_code_paths_return_a_value);
-                            }
-                        }
-                        else {
+                        if (!(node.flags & NodeFlags.HasExplicitReturn)) {
                             error(node.name, Diagnostics.A_get_accessor_must_return_a_value);
                         }
                     }
@@ -13953,7 +13948,10 @@ namespace ts {
                         checkAccessorDeclarationTypesIdentical(node, otherAccessor, getThisTypeOfDeclaration, Diagnostics.get_and_set_accessor_must_have_the_same_this_type);
                     }
                 }
-                getTypeOfAccessors(getSymbolOfNode(node));
+                const returnType = getTypeOfAccessors(getSymbolOfNode(node));
+                if (node.kind === SyntaxKind.GetAccessor) {
+                    checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, returnType);
+                }
             }
             if (node.parent.kind !== SyntaxKind.ObjectLiteralExpression) {
                 checkSourceElement(node.body);
diff --git a/tests/baselines/reference/getterControlFlowStrictNull.errors.txt b/tests/baselines/reference/getterControlFlowStrictNull.errors.txt
new file mode 100644
index 0000000000000..1c4f02d6a756f
--- /dev/null
+++ b/tests/baselines/reference/getterControlFlowStrictNull.errors.txt
@@ -0,0 +1,27 @@
+tests/cases/compiler/getterControlFlowStrictNull.ts(2,9): error TS2366: Function lacks ending return statement and return type does not include 'undefined'.
+tests/cases/compiler/getterControlFlowStrictNull.ts(11,14): error TS2366: Function lacks ending return statement and return type does not include 'undefined'.
+
+
+==== tests/cases/compiler/getterControlFlowStrictNull.ts (2 errors) ====
+    class A {
+       a(): string | null {
+            ~~~~~~~~~~~~~
+!!! error TS2366: Function lacks ending return statement and return type does not include 'undefined'.
+            if (Math.random() > 0.5) {
+                return '';
+            }
+    
+            // it does error here as expected
+        }
+    }
+    class B {
+        get a(): string | null {
+                 ~~~~~~~~~~~~~
+!!! error TS2366: Function lacks ending return statement and return type does not include 'undefined'.
+            if (Math.random() > 0.5) {
+                return '';
+            }
+    
+            // it should error here because it returns undefined
+        }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/getterControlFlowStrictNull.js b/tests/baselines/reference/getterControlFlowStrictNull.js
new file mode 100644
index 0000000000000..c3f7e410d0a7c
--- /dev/null
+++ b/tests/baselines/reference/getterControlFlowStrictNull.js
@@ -0,0 +1,47 @@
+//// [getterControlFlowStrictNull.ts]
+class A {
+   a(): string | null {
+        if (Math.random() > 0.5) {
+            return '';
+        }
+
+        // it does error here as expected
+    }
+}
+class B {
+    get a(): string | null {
+        if (Math.random() > 0.5) {
+            return '';
+        }
+
+        // it should error here because it returns undefined
+    }
+}
+
+//// [getterControlFlowStrictNull.js]
+var A = (function () {
+    function A() {
+    }
+    A.prototype.a = function () {
+        if (Math.random() > 0.5) {
+            return '';
+        }
+        // it does error here as expected
+    };
+    return A;
+}());
+var B = (function () {
+    function B() {
+    }
+    Object.defineProperty(B.prototype, "a", {
+        get: function () {
+            if (Math.random() > 0.5) {
+                return '';
+            }
+            // it should error here because it returns undefined
+        },
+        enumerable: true,
+        configurable: true
+    });
+    return B;
+}());
diff --git a/tests/cases/compiler/getterControlFlowStrictNull.ts b/tests/cases/compiler/getterControlFlowStrictNull.ts
new file mode 100644
index 0000000000000..44fbe35978942
--- /dev/null
+++ b/tests/cases/compiler/getterControlFlowStrictNull.ts
@@ -0,0 +1,20 @@
+//@strictNullChecks: true
+//@target: ES5
+class A {
+   a(): string | null {
+        if (Math.random() > 0.5) {
+            return '';
+        }
+
+        // it does error here as expected
+    }
+}
+class B {
+    get a(): string | null {
+        if (Math.random() > 0.5) {
+            return '';
+        }
+
+        // it should error here because it returns undefined
+    }
+}
\ No newline at end of file