diff --git a/types/schemas.go b/types/schemas.go
index 6b49c50c..92f1e610 100644
--- a/types/schemas.go
+++ b/types/schemas.go
@@ -327,11 +327,9 @@ func (s *Schemas) doSchema(version *APIVersion, name string, lock bool) *Schema
 
 	if lock {
 		s.Lock()
+		defer s.Unlock()
 	}
 	schemas, ok := s.schemasByPath[path]
-	if lock {
-		s.Unlock()
-	}
 	if !ok {
 		return nil
 	}