diff --git a/src/Db/Db.py b/src/Db/Db.py
index 576433be..8ac43e43 100644
--- a/src/Db/Db.py
+++ b/src/Db/Db.py
@@ -76,13 +76,11 @@ class Db(object):
 
     # Execute query using dbcursor
     def execute(self, query, params=None):
-        self.last_query_time = time.time()
         if not self.conn:
             self.connect()
         return self.cur.execute(query, params)
 
     def insertOrUpdate(self, *args, **kwargs):
-        self.last_query_time = time.time()
         if not self.conn:
             self.connect()
         return self.cur.insertOrUpdate(*args, **kwargs)
@@ -101,7 +99,6 @@ class Db(object):
         if not self.delayed_queue:
             self.log.debug("processDelayed aborted")
             return
-        self.last_query_time = time.time()
         if not self.conn:
             self.connect()
 
diff --git a/src/Db/DbCursor.py b/src/Db/DbCursor.py
index 9231d579..8697f350 100644
--- a/src/Db/DbCursor.py
+++ b/src/Db/DbCursor.py
@@ -13,6 +13,7 @@ class DbCursor:
         self.logging = False
 
     def execute(self, query, params=None):
+        self.db.last_query_time = time.time()
         if isinstance(params, dict) and "?" in query:  # Make easier select and insert by allowing dict params
             if query.startswith("SELECT") or query.startswith("DELETE") or query.startswith("UPDATE"):
                 # Convert param dict to SELECT * FROM table WHERE key = ? AND key2 = ? format