diff --git a/pype/ftrack/events/event_thumbnail_updates.py b/pype/ftrack/events/event_thumbnail_updates.py
index ae6f8adb5e..620d1a5b72 100644
--- a/pype/ftrack/events/event_thumbnail_updates.py
+++ b/pype/ftrack/events/event_thumbnail_updates.py
@@ -20,7 +20,8 @@ class ThumbnailEvents(BaseEvent):
                 if parent.get('thumbnail') and not task.get('thumbnail'):
                     task['thumbnail'] = parent['thumbnail']
                     self.log.info('>>> Updated thumbnail on [ %s/%s ]'.format(
-                        parent['name'], task['name']))
+                        parent['name'], task['name']
+                    ))
 
             # Update task thumbnail from published version
             # if (entity['entityType'] == 'assetversion' and
@@ -32,18 +33,24 @@ class ThumbnailEvents(BaseEvent):
 
                 version = session.get('AssetVersion', entity['entityId'])
                 thumbnail = version.get('thumbnail')
-                task = version['task']
-
                 if thumbnail:
-                    task['thumbnail'] = thumbnail
-                    task['parent']['thumbnail'] = thumbnail
-                    self.log.info('>>> Updating thumbnail for task and shot\
-                        [ {} ]'.format(task['name']))
+                    parent = version['asset']['parent']
+                    task = version['task']
+                    parent['thumbnail_id'] = version['thumbnail_id']
+                    if parent.entity_type.lower() == "project":
+                        name = parent["full_name"]
+                    else:
+                        name = parent["name"]
+                    msg = '>>> Updating thumbnail for shot [ {} ]'.format(name)
+
+                    if task:
+                        task['thumbnail_id'] = version['thumbnail_id']
+                        msg += " and task [ {} ]".format(task["name"]))
+
+                    self.log.info(msg)
 
             session.commit()
 
-        pass
-
 
 def register(session, plugins_presets):
     '''Register plugin. Called when used as an plugin.'''