diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index 276d0fe30a..7a46fdf2e7 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -1086,9 +1086,20 @@ namespace Emby.Server.Implementations
                     }
                     else
                     {
+                        // No metafile, so lets see if the folder is versioned.
                         metafile = dir.Split(new[] { Path.DirectorySeparatorChar }, StringSplitOptions.RemoveEmptyEntries)[^1];
-                        // Add it under the path name and version 0.0.0.1.
-                        versions.Add((new Version(0, 0, 0, 1), metafile, dir));
+                        
+                        int versionIndex = dir.LastIndexOf('_');
+                        if (versionIndex != -1 && Version.TryParse(dir.Substring(versionIndex + 1), out Version ver))
+                        {
+                            // Versioned folder.
+                            versions.Add((ver, metafile, dir));
+                        }
+                        else
+                        {
+                            // Un-versioned folder - Add it under the path name and version 0.0.0.1.                        
+                            versions.Add((new Version(0, 0, 0, 1), metafile, dir));
+                        }   
                     }
                 }
                 catch