diff --git a/lib/private/Share20/Manager.php b/lib/private/Share20/Manager.php
index 2b1c7d828f..e2730f4d5f 100644
--- a/lib/private/Share20/Manager.php
+++ b/lib/private/Share20/Manager.php
@@ -1212,6 +1212,10 @@ class Manager implements IManager {
 	 * @return bool
 	 */
 	public function sharingDisabledForUser($userId) {
+		if ($userId === null) {
+			return false;
+		}
+
 		if (isset($this->sharingDisabledForUsersCache[$userId])) {
 			return $this->sharingDisabledForUsersCache[$userId];
 		}
diff --git a/lib/public/Util.php b/lib/public/Util.php
index 86f8456521..687f4e78f6 100644
--- a/lib/public/Util.php
+++ b/lib/public/Util.php
@@ -181,7 +181,12 @@ class Util {
 			self::$shareManager = \OC::$server->getShareManager();
 		}
 
-		return self::$shareManager->sharingDisabledForUser(\OC::$server->getUserSession()->getUser()->getUID());
+		$user = \OC::$server->getUserSession()->getUser();
+		if ($user !== null) {
+			$user = $user->getUID();
+		}
+
+		return self::$shareManager->sharingDisabledForUser($user);
 	}
 
 	/**