diff --git a/docker/daemon.go b/docker/daemon.go
index 73a3e7193a..880bc7a35a 100644
--- a/docker/daemon.go
+++ b/docker/daemon.go
@@ -100,6 +100,7 @@ func migrateKey() (err error) {
 				err = os.Remove(oldPath)
 			} else {
 				logrus.Warnf("Key migration failed, key file not removed at %s", oldPath)
+				os.Remove(newPath)
 			}
 		}()