diff --git a/src/mod_muc.erl b/src/mod_muc.erl
index a3447b281..e546a94a9 100644
--- a/src/mod_muc.erl
+++ b/src/mod_muc.erl
@@ -744,7 +744,7 @@ get_room_disco_item({Name, Host, Pid},
 		    {get_disco_item, Filter, JID, Lang}) ->
     RoomJID = jid:make(Name, Host),
     Timeout = 100,
-    Time = erlang:monotonic_time(millisecond),
+    Time = erlang:system_time(millisecond),
     Query1 = {get_disco_item, Filter, JID, Lang, Time+Timeout},
     try p1_fsm:sync_send_all_state_event(Pid, Query1, Timeout) of
 	{item, Desc} ->
diff --git a/src/mod_muc_room.erl b/src/mod_muc_room.erl
index 2d3865120..79b94e74d 100644
--- a/src/mod_muc_room.erl
+++ b/src/mod_muc_room.erl
@@ -521,7 +521,7 @@ handle_sync_event({get_disco_item, Filter, JID, Lang, Time}, _From, StateName, S
 	false ->
 	    false
     end,
-    CurrentTime = erlang:monotonic_time(millisecond),
+    CurrentTime = erlang:system_time(millisecond),
     if CurrentTime < Time ->
 	    {reply, Reply, StateName, StateData};
        true ->