diff --git a/server_addon/substancepainter/client/ayon_substancepainter/plugins/publish/collect_workfile_version.py b/client/ayon_core/plugins/publish/collect_workfile_version.py
similarity index 61%
rename from server_addon/substancepainter/client/ayon_substancepainter/plugins/publish/collect_workfile_version.py
rename to client/ayon_core/plugins/publish/collect_workfile_version.py
index 3d6a6e4b44..e54e107e5e 100644
--- a/server_addon/substancepainter/client/ayon_substancepainter/plugins/publish/collect_workfile_version.py
+++ b/client/ayon_core/plugins/publish/collect_workfile_version.py
@@ -5,15 +5,15 @@ from ayon_core.lib import get_version_from_path
 
 
 class CollectWorkfileVersion(pyblish.api.ContextPlugin):
-    """Inject the current working file into context"""
+    """Collect current workfile version as context data"""
 
     order = pyblish.api.CollectorOrder - 0.5
     label = "Current Workfile Version"
-    hosts = ["substancepainter"]
 
     def process(self, context):
         host = registered_host()
         path = host.get_current_workfile()
-        version = int(get_version_from_path(path))
-        context.data["version"] = version
-        self.log.debug(f"Current Version: {version}")
\ No newline at end of file
+        if path:
+            version = int(get_version_from_path(path))
+            context.data["version"] = version
+            self.log.debug(f"Current Version: {version}")