diff --git a/resources/lib/objects/_kodi_movies.py b/resources/lib/objects/_kodi_movies.py
index 9cb7a1d6..5ed72f5a 100644
--- a/resources/lib/objects/_kodi_movies.py
+++ b/resources/lib/objects/_kodi_movies.py
@@ -115,8 +115,8 @@ class KodiMovies(KodiItems):
 
     def get_ratingid(self, media_id):
 
-        query = "SELECT rating_id FROM rating WHERE media_id = ?"
-        self.cursor.execute(query, (media_id,))
+        query = "SELECT rating_id FROM rating WHERE media_type = ? AND media_id = ?"
+        self.cursor.execute(query, ("movie", media_id,))
         try:
             ratingid = self.cursor.fetchone()[0]
         except TypeError:
@@ -146,8 +146,8 @@ class KodiMovies(KodiItems):
 
     def get_uniqueid(self, media_id):
 
-        query = "SELECT uniqueid_id FROM uniqueid WHERE media_id = ?"
-        self.cursor.execute(query, (media_id,))
+        query = "SELECT uniqueid_id FROM uniqueid WHERE media_type = ? AND media_id = ?"
+        self.cursor.execute(query, ("movie", media_id,))
         try:
             uniqueid = self.cursor.fetchone()[0]
         except TypeError:
diff --git a/resources/lib/objects/_kodi_tvshows.py b/resources/lib/objects/_kodi_tvshows.py
index aa291b9a..991c7a0b 100644
--- a/resources/lib/objects/_kodi_tvshows.py
+++ b/resources/lib/objects/_kodi_tvshows.py
@@ -74,10 +74,10 @@ class KodiTVShows(KodiItems):
 
         return kodi_id
 
-    def get_ratingid(self, media_id):
+    def get_ratingid(self, media_type, media_id):
 
-        query = "SELECT rating_id FROM rating WHERE media_id = ?"
-        self.cursor.execute(query, (media_id,))
+        query = "SELECT rating_id FROM rating WHERE media_type = ? AND media_id = ?"
+        self.cursor.execute(query, (media_type, media_id,))
         try:
             ratingid = self.cursor.fetchone()[0]
         except TypeError:
@@ -105,10 +105,10 @@ class KodiTVShows(KodiItems):
         ))
         self.cursor.execute(query, (args))
 
-    def get_uniqueid(self, media_id):
+    def get_uniqueid(self, media_type, media_id):
 
-        query = "SELECT uniqueid_id FROM uniqueid WHERE media_id = ?"
-        self.cursor.execute(query, (media_id,))
+        query = "SELECT uniqueid_id FROM uniqueid WHERE media_type = ? AND media_id = ?"
+        self.cursor.execute(query, (media_type, media_id,))
         try:
             uniqueid = self.cursor.fetchone()[0]
         except TypeError:
diff --git a/resources/lib/objects/movies.py b/resources/lib/objects/movies.py
index 3c3f67b2..3be163f0 100644
--- a/resources/lib/objects/movies.py
+++ b/resources/lib/objects/movies.py
@@ -243,13 +243,13 @@ class Movies(Items):
             if self.kodi_version >= 17:
                 ratingid =  self.kodi_db.get_ratingid(movieid)
 
-                self.kodi_db.update_ratings(movieid, "movie", "default", rating, votecount,ratingid)
+                self.kodi_db.update_ratings(movieid, "movie", "default", rating, votecount, ratingid)
 
             # update new uniqueid Kodi 17
             if self.kodi_version >= 17:
                 uniqueid =  self.kodi_db.get_uniqueid(movieid)
 
-                self.kodi_db.update_uniqueid(movieid, "movie", imdb, "imdb",uniqueid)
+                self.kodi_db.update_uniqueid(movieid, "movie", imdb, "imdb", uniqueid)
 
             # Update the movie entry
             if self.kodi_version >= 17:
diff --git a/resources/lib/objects/tvshows.py b/resources/lib/objects/tvshows.py
index fc19a7d1..57fd78d6 100644
--- a/resources/lib/objects/tvshows.py
+++ b/resources/lib/objects/tvshows.py
@@ -344,13 +344,13 @@ class TVShows(Items):
 
             # update new ratings Kodi 17
             if self.kodi_version > 16:
-                ratingid =  self.kodi_db.get_ratingid(showid)
+                ratingid =  self.kodi_db.get_ratingid("tvshow", showid)
 
                 self.kodi_db.update_ratings(showid, "tvshow", "default", rating, votecount,ratingid)
 
             # update new uniqueid Kodi 17
             if self.kodi_version > 16:
-                uniqueid =  self.kodi_db.get_uniqueid(showid)
+                uniqueid =  self.kodi_db.get_uniqueid("tvshow", showid)
 
                 self.kodi_db.update_uniqueid(showid, "tvshow", imdb, "imdb",uniqueid)
 
@@ -609,13 +609,13 @@ class TVShows(Items):
 
             # update new ratings Kodi 17
             if self.kodi_version >= 17:
-                ratingid =  self.kodi_db.get_ratingid(episodeid)
+                ratingid =  self.kodi_db.get_ratingid("episode", episodeid)
 
                 self.kodi_db.update_ratings(episodeid, "episode", "default", rating, votecount,ratingid)
 
             # update new uniqueid Kodi 17
             if self.kodi_version >= 17:
-                uniqueid =  self.kodi_db.get_uniqueid(episodeid)
+                uniqueid =  self.kodi_db.get_uniqueid("episode", episodeid)
 
                 self.kodi_db.update_uniqueid(episodeid, "episode", tvdb, "tvdb",uniqueid)