diff --git a/storage/drivers/overlay/overlay.go b/storage/drivers/overlay/overlay.go
index f65b2c515a..faae4992e7 100644
--- a/storage/drivers/overlay/overlay.go
+++ b/storage/drivers/overlay/overlay.go
@@ -863,7 +863,11 @@ func (d *Driver) Cleanup() error {
 	if anyPresent {
 		return nil
 	}
-	return mount.Unmount(d.home)
+	// Ensure that we do not unmount anything not mounted by us
+	if !d.options.skipMountHome {
+		return mount.Unmount(d.home)
+	}
+	return nil
 }
 
 // pruneStagingDirectories cleans up any staging directory that was leaked.