diff --git a/resources/lib/objects/actions.py b/resources/lib/objects/actions.py
index 59f1480f..e7f24c3d 100644
--- a/resources/lib/objects/actions.py
+++ b/resources/lib/objects/actions.py
@@ -295,9 +295,7 @@ class Actions(object):
         if obj['Premiere']:
             obj['Premiere'] = obj['Premiere'].split('T')[0]
 
-        if not obj['Played']:
-            obj['DatePlayed'] = None
-        elif obj['DatePlayed']:
+        if obj['DatePlayed']:
             obj['DatePlayed'] = obj['DatePlayed'].split('.')[0].replace('T', " ")
 
         metadata = {
diff --git a/resources/lib/objects/movies.py b/resources/lib/objects/movies.py
index 328ed4b8..730884b2 100644
--- a/resources/lib/objects/movies.py
+++ b/resources/lib/objects/movies.py
@@ -88,7 +88,7 @@ class Movies(KodiDb):
         obj['Runtime'] = round(float((obj['Runtime'] or 0) / 10000000.0), 6)
         obj['People'] = API.get_people_artwork(obj['People'])
         obj['DateAdded'] = obj['DateAdded'].split('.')[0].replace('T', " ")
-        obj['DatePlayed'] = None if not obj['Played'] else (obj['DatePlayed'] or obj['DateAdded']).split('.')[0].replace('T', " ")
+        obj['DatePlayed'] = None if not obj['DatePlayed'] else obj['DatePlayed'].split('.')[0].replace('T', " ")
         obj['PlayCount'] = API.get_playcount(obj['Played'], obj['PlayCount'])
         obj['Artwork'] = API.get_all_artwork(self.objects.map(item, 'Artwork'))
         obj['Video'] = API.video_streams(obj['Video'] or [], obj['Container'])
@@ -300,9 +300,7 @@ class Movies(KodiDb):
         obj['Runtime'] = round(float((obj['Runtime'] or 0) / 10000000.0), 6)
         obj['PlayCount'] = API.get_playcount(obj['Played'], obj['PlayCount'])
 
-        if not obj['Played']:
-            obj['DatePlayed'] = None
-        elif obj['DatePlayed']:
+        if obj['DatePlayed']:
             obj['DatePlayed'] = obj['DatePlayed'].split('.')[0].replace('T', " ")
 
         if obj['Favorite']:
diff --git a/resources/lib/objects/music.py b/resources/lib/objects/music.py
index 1ec67fee..36fa34c8 100644
--- a/resources/lib/objects/music.py
+++ b/resources/lib/objects/music.py
@@ -270,10 +270,8 @@ class Music(KodiDb):
         if obj['DateAdded']:
             obj['DateAdded'] = obj['DateAdded'].split('.')[0].replace('T', " ")
 
-        if not obj['Played']:
-            obj['DatePlayed'] = None
-        elif obj['DateAdded'] or obj['DatePlayed']:
-            obj['DatePlayed'] = (obj['DatePlayed'] or obj['DateAdded']).split('.')[0].replace('T', " ")
+        if obj['DatePlayed']:
+            obj['DatePlayed'] = obj['DatePlayed'].split('.')[0].replace('T', " ")
 
         if obj['Disc'] != 1:
             obj['Index'] = obj['Disc'] * 2 ** 16 + obj['Index']
@@ -323,7 +321,7 @@ class Music(KodiDb):
 
         self.add_song(*values(obj, QU.add_song_obj))
         self.emby_db.add_reference(*values(obj, QUEM.add_reference_song_obj))
-        LOG.debug("ADD song [%s/%s/%s] %s: %s", obj['PathId'], obj['AlbumId'], obj['SongId'], obj['Id'], obj['Title'])
+        LOG.info("ADD song [%s/%s/%s] %s: %s", obj['PathId'], obj['AlbumId'], obj['SongId'], obj['Id'], obj['Title'])
 
     def song_update(self, obj):
         
@@ -436,9 +434,7 @@ class Music(KodiDb):
 
         if obj['Media'] == 'song':
 
-            if not obj['Played']:
-                obj['DatePlayed'] = None
-            elif obj['DatePlayed']:
+            if obj['DatePlayed']:
                 obj['DatePlayed'] = obj['DatePlayed'].split('.')[0].replace('T', " ")
 
             self.rate_song(*values(obj, QU.update_song_rating_obj))
diff --git a/resources/lib/objects/musicvideos.py b/resources/lib/objects/musicvideos.py
index 3e178b54..a779a143 100644
--- a/resources/lib/objects/musicvideos.py
+++ b/resources/lib/objects/musicvideos.py
@@ -80,7 +80,7 @@ class MusicVideos(KodiDb):
         obj['Studios'] = [API.validate_studio(studio) for studio in (obj['Studios'] or [])]
         obj['Plot'] = API.get_overview(obj['Plot'])
         obj['DateAdded'] = obj['DateAdded'].split('.')[0].replace('T', " ")
-        obj['DatePlayed'] = None if not obj['Played'] else (obj['DatePlayed'] or obj['DateAdded']).split('.')[0].replace('T', " ")
+        obj['DatePlayed'] = None if not obj['DatePlayed'] else obj['DatePlayed'].split('.')[0].replace('T', " ")
         obj['PlayCount'] = API.get_playcount(obj['Played'], obj['PlayCount'])
         obj['Resume'] = API.adjust_resume((obj['Resume'] or 0) / 10000000.0)
         obj['Runtime'] = round(float((obj['Runtime'] or 0) / 10000000.0), 6)
@@ -200,9 +200,7 @@ class MusicVideos(KodiDb):
         obj['Runtime'] = round(float((obj['Runtime'] or 0) / 10000000.0), 6)
         obj['PlayCount'] = API.get_playcount(obj['Played'], obj['PlayCount'])
 
-        if not obj['Played']:
-            obj['DatePlayed'] = None
-        elif obj['DatePlayed']:
+        if obj['DatePlayed']:
             obj['DatePlayed'] = obj['DatePlayed'].split('.')[0].replace('T', " ")
 
         if obj['Favorite']:
diff --git a/resources/lib/objects/tvshows.py b/resources/lib/objects/tvshows.py
index 9a2a8b9c..00123893 100644
--- a/resources/lib/objects/tvshows.py
+++ b/resources/lib/objects/tvshows.py
@@ -290,7 +290,7 @@ class TVShows(KodiDb):
         obj['Runtime'] = round(float((obj['Runtime'] or 0) / 10000000.0), 6)
         obj['People'] = API.get_people_artwork(obj['People'] or [])
         obj['DateAdded'] = obj['DateAdded'].split('.')[0].replace('T', " ")
-        obj['DatePlayed'] = None if not obj['Played'] else (obj['DatePlayed'] or obj['DateAdded']).split('.')[0].replace('T', " ")
+        obj['DatePlayed'] = None if not obj['DatePlayed'] else obj['DatePlayed'].split('.')[0].replace('T', " ")
         obj['PlayCount'] = API.get_playcount(obj['Played'], obj['PlayCount'])
         obj['Artwork'] = API.get_all_artwork(self.objects.map(item, 'Artwork'))
         obj['Video'] = API.video_streams(obj['Video'] or [], obj['Container'])
@@ -455,9 +455,7 @@ class TVShows(KodiDb):
             obj['Runtime'] = round(float((obj['Runtime'] or 0) / 10000000.0), 6)
             obj['PlayCount'] = API.get_playcount(obj['Played'], obj['PlayCount'])
 
-            if not obj['Played']:
-                obj['DatePlayed'] = None
-            elif obj['DatePlayed']:
+            if obj['DatePlayed']:
                 obj['DatePlayed'] = obj['DatePlayed'].split('.')[0].replace('T', " ")
 
             if obj['DateAdded']: