diff --git a/openpype/pipeline/farm/pyblish_functions.py b/openpype/pipeline/farm/pyblish_functions.py
index 61cceb80ad..fb73e46508 100644
--- a/openpype/pipeline/farm/pyblish_functions.py
+++ b/openpype/pipeline/farm/pyblish_functions.py
@@ -583,11 +583,15 @@ def _create_instances_for_aov(instance, skeleton, aov_filter, additional_data,
         else:
             # in case of single frame
             cam = [c for c in cameras if c in col]
-        if cam or subset != "maxrenderMain":
+        if cam:
             if aov:
                 subset_name = '{}_{}_{}'.format(group_name, cam, aov)
+                if subset == "maxrenderMain":
+                    subset_name = '{}_{}'.format(group_name, aov)
             else:
                 subset_name = '{}_{}'.format(group_name, cam)
+                if subset == "maxrenderMain":
+                    subset_name = '{}'.format(group_name)
         else:
             if aov:
                 subset_name = '{}_{}'.format(group_name, aov)