diff --git a/apps/encryption/lib/KeyManager.php b/apps/encryption/lib/KeyManager.php
index 26f023ed8f9..96264d01363 100644
--- a/apps/encryption/lib/KeyManager.php
+++ b/apps/encryption/lib/KeyManager.php
@@ -406,6 +406,9 @@ class KeyManager {
 		}
 
 		if ($this->util->isMasterKeyEnabled()) {
+			if ($this->session->getStatus() === Session::NOT_INITIALIZED)
+                        	$this->init('', '');
+			
 			$uid = $this->getMasterKeyId();
 		}