diff --git a/apps/encryption/lib/crypto/encryptall.php b/apps/encryption/lib/crypto/encryptall.php
index a0c69c13fd..8e97fe341b 100644
--- a/apps/encryption/lib/crypto/encryptall.php
+++ b/apps/encryption/lib/crypto/encryptall.php
@@ -280,6 +280,12 @@ class EncryptAll {
 				$newPasswords[] = [$uid, $password];
 			}
 		}
+
+		if (empty($newPasswords)) {
+			$this->output->writeln("\nAll users already had a key-pair, no further action needed.\n");
+			return;
+		}
+
 		$table->setRows($newPasswords);
 		$table->render();