diff --git a/daemon/graphdriver/devmapper/deviceset.go b/daemon/graphdriver/devmapper/deviceset.go
index 5515df9960..5923811d26 100644
--- a/daemon/graphdriver/devmapper/deviceset.go
+++ b/daemon/graphdriver/devmapper/deviceset.go
@@ -1249,6 +1249,9 @@ func (devices *DeviceSet) deactivateDevice(info *DevInfo) error {
 func (devices *DeviceSet) removeDeviceAndWait(devname string) error {
 	var err error
 
+	logrus.Debugf("[devmapper] removeDeviceAndWait START(%s)", devname)
+	defer logrus.Debugf("[devmapper] removeDeviceAndWait END(%s)", devname)
+
 	for i := 0; i < 1000; i++ {
 		err = devicemapper.RemoveDevice(devname)
 		if err == nil {
diff --git a/pkg/devicemapper/devmapper.go b/pkg/devicemapper/devmapper.go
index e8341692a4..f75031996d 100644
--- a/pkg/devicemapper/devmapper.go
+++ b/pkg/devicemapper/devmapper.go
@@ -349,8 +349,6 @@ func CookieSupported() bool {
 
 // Useful helper for cleanup
 func RemoveDevice(name string) error {
-	logrus.Debugf("[devmapper] RemoveDevice START(%s)", name)
-	defer logrus.Debugf("[devmapper] RemoveDevice END(%s)", name)
 	task, err := TaskCreateNamed(DeviceRemove, name)
 	if task == nil {
 		return err