diff --git a/module/config/utils.py b/module/config/utils.py
index f26443fd9..369323dad 100644
--- a/module/config/utils.py
+++ b/module/config/utils.py
@@ -361,7 +361,8 @@ def get_os_next_reset():
     server_now = datetime.now() - diff
     server_reset = (server_now.replace(day=1) + timedelta(days=32)) \
         .replace(day=1, hour=0, minute=0, second=0, microsecond=0)
-    local_reset = server_reset + diff
+    server_reset = server_reset.replace(tzinfo=timezone(server_timezone()))
+    local_reset = server_reset.astimezone().replace(tzinfo=None)
     return local_reset