diff --git a/daemon/graphdriver/devmapper/deviceset.go b/daemon/graphdriver/devmapper/deviceset.go
index 0f2dcb9f37..656b5cce5d 100644
--- a/daemon/graphdriver/devmapper/deviceset.go
+++ b/daemon/graphdriver/devmapper/deviceset.go
@@ -691,6 +691,9 @@ func getDeviceUUID(device string) (string, error) {
 }
 
 func (devices *DeviceSet) verifyBaseDeviceUUID(baseInfo *DevInfo) error {
+	devices.Lock()
+	defer devices.Unlock()
+
 	if err := devices.activateDeviceIfNeeded(baseInfo); err != nil {
 		return err
 	}
@@ -710,6 +713,9 @@ func (devices *DeviceSet) verifyBaseDeviceUUID(baseInfo *DevInfo) error {
 }
 
 func (devices *DeviceSet) saveBaseDeviceUUID(baseInfo *DevInfo) error {
+	devices.Lock()
+	defer devices.Unlock()
+
 	if err := devices.activateDeviceIfNeeded(baseInfo); err != nil {
 		return err
 	}