diff --git a/volume/drivers/extpoint.go b/volume/drivers/extpoint.go
index 785063dfff..3de897e16d 100644
--- a/volume/drivers/extpoint.go
+++ b/volume/drivers/extpoint.go
@@ -107,19 +107,15 @@ func lookup(name string) (volume.Driver, error) {
 		return nil, fmt.Errorf("Error looking up volume plugin %s: %v", name, err)
 	}
 
-	drivers.Lock()
-	defer drivers.Unlock()
-	if ext, ok := drivers.extensions[name]; ok {
-		return ext, nil
-	}
-
 	d := NewVolumeDriver(name, p.Client())
 	if err := validateDriver(d); err != nil {
 		return nil, err
 	}
 
 	if p.IsLegacy() {
+		drivers.Lock()
 		drivers.extensions[name] = d
+		drivers.Unlock()
 	}
 	return d, nil
 }