diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc
index eff2f6f..36247ee 100644
--- a/runtime/class_linker.cc
+++ b/runtime/class_linker.cc
@@ -2008,7 +2008,7 @@
       if (pair.second != nullptr) {
         mirror::Class* klass = LookupClass(descriptor, nullptr);
         if (klass != nullptr) {
-          return klass;
+          return EnsureResolved(self, descriptor, klass);
         }
         klass = DefineClass(descriptor, NullHandle<mirror::ClassLoader>(), *pair.first,
                             *pair.second);