diff --git a/plugins/mod_uptime.lua b/plugins/mod_uptime.lua
index f0a428d2f..eb0ca7cc7 100644
--- a/plugins/mod_uptime.lua
+++ b/plugins/mod_uptime.lua
@@ -15,6 +15,8 @@ local t_concat = table.concat;
 
 local start_time = prosody.start_time;
 
+prosody.events.add_handler("server-started", function () start_time = prosody.start_time end);
+
 module:add_feature("jabber:iq:last");
 
 module:add_iq_handler({"c2s", "s2sin"}, "jabber:iq:last",