diff --git a/src/find-options/FindConditions.ts b/src/find-options/FindConditions.ts
index 42b7a1779a..c234391bfd 100644
--- a/src/find-options/FindConditions.ts
+++ b/src/find-options/FindConditions.ts
@@ -1,8 +1,11 @@
-import {FindOperator} from "./FindOperator";
+import { FindOperator } from "./FindOperator";
 
 /**
  * Used for find operations.
  */
 export type FindConditions<T> = {
-    [P in keyof T]?: FindConditions<T[P]>|FindOperator<FindConditions<T[P]>>;
+    // @petter: https://github.com/typeorm/typeorm/issues/4427
+    [P in keyof T]?: T[P] extends never
+        ? FindConditions<T[P]> | FindOperator<FindConditions<T[P]>>
+        : FindConditions<T[P]> | FindOperator<FindConditions<T[P]>>;
 };