diff --git a/pype/ftrack/actions/action_sync_to_avalon.py b/pype/ftrack/actions/action_sync_to_avalon.py
index 12d84ce0ca..5265cb6ca2 100644
--- a/pype/ftrack/actions/action_sync_to_avalon.py
+++ b/pype/ftrack/actions/action_sync_to_avalon.py
@@ -585,7 +585,7 @@ class SyncEntitiesFactory:
         ])
 
         cust_attr_query = (
-            "select value, entity_id from CustomAttributeValue "
+            "select value, entity_id from ContextCustomAttributeValue "
             "where entity_id in ({}) and configuration.key in ({})"
         )
         [values] = self.session._call([{
@@ -649,7 +649,7 @@ class SyncEntitiesFactory:
         [values] = self.session._call([{
             "action": "query",
             "expression": (
-                "select value, entity_id from CustomAttributeValue "
+                "select value, entity_id from ContextCustomAttributeValue "
                 "where entity_id in ({}) and configuration.key in ({})"
             ).format(entity_ids_joined, attributes_joined)
         }])
diff --git a/pype/ftrack/events/action_sync_to_avalon.py b/pype/ftrack/events/action_sync_to_avalon.py
index 0587aae31e..fdc64e4a04 100644
--- a/pype/ftrack/events/action_sync_to_avalon.py
+++ b/pype/ftrack/events/action_sync_to_avalon.py
@@ -585,7 +585,7 @@ class SyncEntitiesFactory:
         ])
 
         cust_attr_query = (
-            "select value, entity_id from CustomAttributeValue "
+            "select value, entity_id from ContextCustomAttributeValue "
             "where entity_id in ({}) and configuration.key in ({})"
         )
         [values] = self.session._call([{
@@ -649,7 +649,7 @@ class SyncEntitiesFactory:
         [values] = self.session._call([{
             "action": "query",
             "expression": (
-                "select value, entity_id from CustomAttributeValue "
+                "select value, entity_id from ContextCustomAttributeValue "
                 "where entity_id in ({}) and configuration.key in ({})"
             ).format(entity_ids_joined, attributes_joined)
         }])