diff --git a/client/ayon_core/plugins/publish/collect_from_create_context.py b/client/ayon_core/plugins/publish/collect_from_create_context.py
index d8e803a43c..7adacbc463 100644
--- a/client/ayon_core/plugins/publish/collect_from_create_context.py
+++ b/client/ayon_core/plugins/publish/collect_from_create_context.py
@@ -61,7 +61,10 @@ class CollectFromCreateContext(pyblish.api.ContextPlugin):
             ("AVALON_ASSET", asset_name),
             ("AVALON_TASK", task_name)
         ):
-            os.environ[key] = value
+            if value is None:
+                os.environ.pop(key, None)
+            else:
+                os.environ[key] = value
 
     def create_instance(
         self,