diff --git a/lib/private/Repair/NC20/EncryptionLegacyCipher.php b/lib/private/Repair/NC20/EncryptionLegacyCipher.php
index 7418a66ec5..0be34679fc 100644
--- a/lib/private/Repair/NC20/EncryptionLegacyCipher.php
+++ b/lib/private/Repair/NC20/EncryptionLegacyCipher.php
@@ -54,6 +54,10 @@ class EncryptionLegacyCipher implements IRepairStep {
 	}
 
 	public function run(IOutput $output): void {
+		if (!$this->shouldRun()) {
+			return;
+		}
+
 		if ($this->manager->isEnabled()) {
 			if ($this->config->getSystemValue('encryption.legacy_format_support', '') === '') {
 				$this->config->setSystemValue('encryption.legacy_format_support', true);
diff --git a/lib/private/Repair/NC20/EncryptionMigration.php b/lib/private/Repair/NC20/EncryptionMigration.php
index 41681a314a..1eba09f413 100644
--- a/lib/private/Repair/NC20/EncryptionMigration.php
+++ b/lib/private/Repair/NC20/EncryptionMigration.php
@@ -54,6 +54,10 @@ class EncryptionMigration implements IRepairStep {
 	}
 
 	public function run(IOutput $output): void {
+		if (!$this->shouldRun()) {
+			return;
+		}
+
 		if ($this->manager->isEnabled()) {
 			if ($this->config->getSystemValue('encryption.key_storage_migrated', '') === '') {
 				$this->config->setSystemValue('encryption.key_storage_migrated', false);