--- a/mod_mam/mamprefs.lib.lua	Fri Nov 10 05:33:28 2017 +0100
+++ b/mod_mam/mamprefs.lib.lua	Tue Oct 17 12:42:20 2017 +0200
@@ -24,9 +24,11 @@
 local function get_prefs(user)
 	local user_sessions = sessions[user];
 	local user_prefs = user_sessions and user_sessions.archive_prefs
-	if not user_prefs and user_sessions then
+	if not user_prefs then
 		user_prefs = prefs:get(user);
-		user_sessions.archive_prefs = user_prefs;
+		if user_sessions then
+			user_sessions.archive_prefs = user_prefs;
+		end
 	end
 	return user_prefs or { [false] = global_default_policy };
 end