diff --git a/lib/private/user.php b/lib/private/user.php
index 17b84d1f93..d66354b247 100644
--- a/lib/private/user.php
+++ b/lib/private/user.php
@@ -343,7 +343,14 @@ class OC_User {
 	 */
 	public static function setIncognitoMode($status) {
 		self::$incognitoMode = $status;
+	}
 
+	/**
+	 * get incognito mode status
+	 * @return bool
+	 */
+	public static function isIncognitoMode() {
+		return self::$incognitoMode;
 	}
 
 	/**
diff --git a/lib/private/user/session.php b/lib/private/user/session.php
index 53662d0095..9324ef2f42 100644
--- a/lib/private/user/session.php
+++ b/lib/private/user/session.php
@@ -124,6 +124,11 @@ class Session implements IUserSession, Emitter {
 	 * @return \OC\User\User
 	 */
 	public function getUser() {
+		// FIXME: This is a quick'n dirty work-around for the incognito mode as
+		// described at https://github.com/owncloud/core/pull/12912#issuecomment-67391155
+		if (\OC_User::isIncognitoMode()) {
+			return null;
+		}
 		if ($this->activeUser) {
 			return $this->activeUser;
 		} else {