diff --git a/src/store/Accounts.ts b/src/store/Accounts.ts
index 57f6a47e..b7907b13 100644
--- a/src/store/Accounts.ts
+++ b/src/store/Accounts.ts
@@ -86,11 +86,11 @@ export class Accounts implements Module {
         updateCodes(state: AccountsState) {
           let second = new Date().getSeconds();
           if (UserSettings.items.offset) {
-            // prevent second from negative
-            second += Number(UserSettings.items.offset) + 60;
+            second += Number(UserSettings.items.offset);
           }
 
-          second = second % 60;
+          // prevent second from negative
+          second = (second < 0) ? (60 - (second * -1) % 60) : (second % 60);
           state.second = second;
 
           let currentlyEncrypted = false;