--- a/plugins/muc/history.lib.lua	Fri Apr 08 17:54:50 2016 +0200
+++ b/plugins/muc/history.lib.lua	Tue Apr 12 19:35:55 2016 +0200
@@ -79,7 +79,7 @@
 
 module:hook("muc-get-history", function(event)
 	local room = event.room;
-	local history = room._data["history"]; -- send discussion history
+	local history = room._history; -- send discussion history
 	if not history then return nil end
 	local history_len = #history;
 
@@ -140,8 +140,8 @@
 	local historic = event.stanza:get_child("body");
 	if historic then
 		local room = event.room
-		local history = room._data["history"];
-		if not history then history = {}; room._data["history"] = history; end
+		local history = room._history;
+		if not history then history = {}; room._history = history; end
 		local stanza = st.clone(event.stanza);
 		stanza.attr.to = "";
 		local ts = gettime();

--- a/plugins/muc/mod_muc.lua	Fri Apr 08 17:54:50 2016 +0200
+++ b/plugins/muc/mod_muc.lua	Tue Apr 12 19:35:55 2016 +0200
@@ -102,15 +102,12 @@
 	local is_persistent = persistent.get(room);
 	persistent_rooms:set(nil, room.jid, is_persistent);
 	if is_persistent then
-		local room_history = room._data.history;
-		room._data.history = nil;
 		local data = {
 			jid = room.jid;
 			_data = room._data;
 			_affiliations = room._affiliations;
 		};
 		room_configs:set(node, data);
-		room._data.history = room_history;
 	elseif forced then
 		room_configs:set(node, nil);
 		if not next(room._occupants) then -- Room empty