diff --git a/src/Db/Db.py b/src/Db/Db.py
index 0a2f280c..7acea90d 100644
--- a/src/Db/Db.py
+++ b/src/Db/Db.py
@@ -222,7 +222,7 @@ class Db(object):
         if not self.conn:
             self.connect()
 
-        cur = DbCursor(self.conn, self)
+        cur = DbCursor(self)
         return cur
 
     def getSharedCursor(self):
diff --git a/src/Db/DbCursor.py b/src/Db/DbCursor.py
index b7d354da..4a337273 100644
--- a/src/Db/DbCursor.py
+++ b/src/Db/DbCursor.py
@@ -2,14 +2,12 @@ import time
 import re
 from util import helper
 
-
 # Special sqlite cursor
 
 
 class DbCursor:
 
-    def __init__(self, conn, db):
-        self.conn = conn
+    def __init__(self, db):
         self.db = db
         self.logging = False
 
@@ -96,24 +94,19 @@ class DbCursor:
         query, params = self.parseQuery(query, params)
 
         s = time.time()
-        cursor = self.conn.cursor()
+        cursor = self.db.getConn().cursor()
+        self.db.cursors.add(cursor)
 
-        try:
-            if self.db.lock.locked():
-                self.db.log.debug("Query delayed: db locked")
-            self.db.lock.acquire(True)
-            if params:
-                res = cursor.execute(query, params)
+        if params:
+            res = cursor.execute(query, params)
+        else:
+            res = cursor.execute(query)
+        taken_query = time.time() - s
+        if self.logging or taken_query > 0.1:
+            if params:  # Query has parameters
+                self.db.log.debug("Query: " + query + " " + str(params) + " (Done in %.4f)" % (time.time() - s))
             else:
-                res = cursor.execute(query)
-            taken_query = time.time() - s
-            if self.logging or taken_query > 0.1:
-                if params:  # Query has parameters
-                    self.db.log.debug("Query: " + query + " " + str(params) + " (Done in %.4f)" % (time.time() - s))
-                else:
-                    self.db.log.debug("Query: " + query + " (Done in %.4f)" % (time.time() - s))
-        finally:
-            self.db.lock.release()
+                self.db.log.debug("Query: " + query + " (Done in %.4f)" % (time.time() - s))
 
         # Log query stats
         if self.db.collect_stats:
@@ -139,7 +132,8 @@ class DbCursor:
         self.db.last_query_time = time.time()
 
         s = time.time()
-        cursor = self.conn.cursor()
+        cursor = self.db.getConn().cursor()
+        self.db.cursors.add(cursor)
 
         try:
             self.db.lock.acquire(True)