summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/encryption/lib/KeyManager.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/encryption/lib/KeyManager.php b/apps/encryption/lib/KeyManager.php
index caae154b2d3..a6708df9a1c 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();
}