diff --git a/plugins/generic/databases.py b/plugins/generic/databases.py
index 77eb5c711..075ad8489 100644
--- a/plugins/generic/databases.py
+++ b/plugins/generic/databases.py
@@ -170,6 +170,9 @@ class Databases:
         else:
             kb.data.cachedDbs.sort()
 
+        if kb.data.cachedDbs:
+            kb.data.cachedDbs = list(set(kb.data.cachedDbs))
+
         return kb.data.cachedDbs
 
     def getTables(self, bruteForce=None):
@@ -356,6 +359,10 @@ class Databases:
             for db, tables in kb.data.cachedTables.items():
                 kb.data.cachedTables[db] = sorted(tables) if tables else tables
 
+        if kb.data.cachedTables:
+            for db in kb.data.cachedTables.keys():
+                kb.data.cachedTables[db] = list(set(kb.data.cachedTables[db]))
+
         return kb.data.cachedTables
 
     def getColumns(self, onlyColNames=False, colTuple=None, bruteForce=None):