diff --git a/src/NServiceBus.Core/DataBus/FileShareDataBusImplementation.cs b/src/NServiceBus.Core/DataBus/FileShareDataBusImplementation.cs
index c58f4c8d30..c7eff58954 100644
--- a/src/NServiceBus.Core/DataBus/FileShareDataBusImplementation.cs
+++ b/src/NServiceBus.Core/DataBus/FileShareDataBusImplementation.cs
@@ -9,6 +9,32 @@ namespace NServiceBus;
 
 class FileShareDataBusImplementation : IDataBus
 {
+    // to account for mixed platforms ie windows -> linux or linux -> windows
+    internal class PathNormalizer
+    {
+        //    Example keys
+        //    string key1 = "foldername/filename";
+        //    string key2 = "foldername\\filename";
+
+        //    Normalize the keys
+        //    string normalizedKey1 = NormalizePath(key1);
+        //    string normalizedKey2 = NormalizePath(key2);
+
+        //    Output the normalized keys
+        //    Console.WriteLine(normalizedKey1); // Output will be "foldername\filename" on Windows, "foldername/filename" on Unix-based systems
+        //    Console.WriteLine(normalizedKey2); // Output will be "foldername\filename" on Windows, "foldername/filename" on Unix-based systems 
+        internal static string NormalizePath(string key)
+        {
+            // Determine the directory separator for the current platform
+            char separator = Path.DirectorySeparatorChar;
+            // Replace any forward slashes (common in URIs) and backward slashes with the platform-specific separator
+            string normalizedPath = key.Replace('/', separator).Replace('\\', separator);
+
+            return normalizedPath;
+        }
+    }
+
+
     public FileShareDataBusImplementation(string basePath)
     {
         this.basePath = basePath;
@@ -18,7 +44,7 @@ public FileShareDataBusImplementation(string basePath)
 
     public Task<Stream> Get(string key, CancellationToken cancellationToken = default)
     {
-        var filePath = Path.Combine(basePath, key);
+        var filePath = Path.Combine(basePath, PathNormalizer.NormalizePath(key));
 
         logger.DebugFormat("Opening stream from '{0}'.", filePath);
 
@@ -71,4 +97,4 @@ string GenerateKey(TimeSpan timeToBeReceived)
 
     readonly string basePath;
     static readonly ILog logger = LogManager.GetLogger<FileShareDataBusImplementation>();
-}
\ No newline at end of file
+}