diff --git a/core/Command/Encryption/DecryptAll.php b/core/Command/Encryption/DecryptAll.php
index d060918a506..83c6c1dc168 100644
--- a/core/Command/Encryption/DecryptAll.php
+++ b/core/Command/Encryption/DecryptAll.php
@@ -129,8 +129,7 @@ class DecryptAll extends Command {
 			}
 
 			$uid = $input->getArgument('user');
-			//FIXME WHEN https://github.com/owncloud/core/issues/24994 is fixed
-			if ($uid === null) {
+			if ($uid === '') {
 				$message = 'your ownCloud';
 			} else {
 				$message = "$uid's account";