diff --git a/src/mod_muc.erl b/src/mod_muc.erl
index 350fe9d39..b25c51dd6 100644
--- a/src/mod_muc.erl
+++ b/src/mod_muc.erl
@@ -1178,7 +1178,7 @@ mod_opt_type(hosts) ->
 mod_opt_type(queue_type) ->
     econf:queue_type();
 mod_opt_type(hibernation_timeout) ->
-    econf:non_neg_int(infinity).
+    econf:timeout(minute, infinity).
 
 mod_options(Host) ->
     [{access, all},
diff --git a/src/mod_muc_room.erl b/src/mod_muc_room.erl
index d29aefb8d..a8b831283 100644
--- a/src/mod_muc_room.erl
+++ b/src/mod_muc_room.erl
@@ -4707,7 +4707,7 @@ reset_hibernate_timer(State) ->
 			   {infinity, _} ->
 			       none;
 			   {Timeout, 0} ->
-			       p1_fsm:send_event_after(timer:minutes(Timeout), hibernate);
+			       p1_fsm:send_event_after(Timeout, hibernate);
 			   _ ->
 			       none
 		       end,