diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
index c5fb6bca8d8..b42520a4f32 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
+++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
@@ -153,11 +153,19 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes
                                 @Nullable
                                 @Override
                                 public JavaClass findClass(@NotNull FqName fqName) {
+                                    // Do not look for JavaClasses for Kotlin binaries
+                                    if (kotlinClassesFromBinaries.invoke(fqName) != null
+                                        || kotlinNamespacesFromBinaries.invoke(fqName) != null) {
+                                        return null;
+                                    }
+
                                     JavaClass javaClass = javaClassFinder.findClass(fqName);
                                     if (javaClass == null) {
                                         return null;
                                     }
-                                    if (DescriptorResolverUtils.isCompiledKotlinClassOrPackageClass(javaClass)) {
+
+                                    // Light classes are not proper binaries either
+                                    if (javaClass.getOriginKind() == JavaClass.OriginKind.KOTLIN_LIGHT_CLASS) {
                                         return null;
                                     }
                                     return javaClass;