diff --git a/pkg/action/upgrade-recovery.go b/pkg/action/upgrade-recovery.go
index 45b4bb8869c..4497b41b23d 100644
--- a/pkg/action/upgrade-recovery.go
+++ b/pkg/action/upgrade-recovery.go
@@ -131,15 +131,8 @@ func (u *UpgradeRecoveryAction) upgradeInstallStateYaml() error {
 		u.spec.State.Partitions[constants.RecoveryPartName] = recoveryPart
 	}
 
-	// Hack to ensure we are not using / or /.snapshots mountpoints. Btrfs based deployments
-	// mount state partition into multiple locations
-	statePath := filepath.Join(u.spec.Partitions.State.MountPoint, constants.InstallStateFile)
-	if u.spec.Partitions.State.MountPoint == "/" || u.spec.Partitions.State.MountPoint == "/.snapshots" {
-		statePath = filepath.Join(constants.RunningStateDir, constants.InstallStateFile)
-	}
-
 	return u.cfg.WriteInstallState(
-		u.spec.State, statePath,
+		u.spec.State, filepath.Join(u.spec.Partitions.State.MountPoint, constants.InstallStateFile),
 		filepath.Join(u.spec.Partitions.Recovery.MountPoint, constants.InstallStateFile),
 	)
 }