diff --git a/apps/encryption/lib/KeyManager.php b/apps/encryption/lib/KeyManager.php
index 26f023ed8f9..1e1f3231b8b 100644
--- a/apps/encryption/lib/KeyManager.php
+++ b/apps/encryption/lib/KeyManager.php
@@ -405,7 +405,7 @@ class KeyManager {
 			return '';
 		}
 
-		if ($this->util->isMasterKeyEnabled()) {
+		if (!is_null($uid) && $this->util->isMasterKeyEnabled()) {
 			$uid = $this->getMasterKeyId();
 		}