diff --git a/src/InformaticsGateway/Services/Storage/ObjectUploadService.cs b/src/InformaticsGateway/Services/Storage/ObjectUploadService.cs
index 5330733c0..32913cf20 100644
--- a/src/InformaticsGateway/Services/Storage/ObjectUploadService.cs
+++ b/src/InformaticsGateway/Services/Storage/ObjectUploadService.cs
@@ -214,6 +214,7 @@ await Policy
                    })
                .ExecuteAsync(async () =>
                {
+                   storageObjectMetadata.Data.Seek(0, System.IO.SeekOrigin.Begin);
                    await _storageService.PutObjectAsync(
                        _configuration.Value.Storage.TemporaryStorageBucket,
                        storageObjectMetadata.GetTempStoragPath(_configuration.Value.Storage.TemporaryStorageRootPath),
diff --git a/tests/Integration.Test/StepDefinitions/HealthLevel7Definitions.cs b/tests/Integration.Test/StepDefinitions/HealthLevel7Definitions.cs
index 673fddedb..fda649b6d 100644
--- a/tests/Integration.Test/StepDefinitions/HealthLevel7Definitions.cs
+++ b/tests/Integration.Test/StepDefinitions/HealthLevel7Definitions.cs
@@ -213,9 +213,6 @@ public async Task ThenMessageAreUploadedToStorageService()
             foreach (var file in request.Payload)
             {
                 _outputHelper.WriteLine($"Verifying file => {request.PayloadId}/{file.Path}...");
-                var retryCount = 0;
-                var matchFound = false;
-            RetryVerifyFileUpload:
                 var getObjectArgs = new GetObjectArgs()
                     .WithBucket(request.Bucket)
                     .WithObject($"{request.PayloadId}/{file.Path}")
@@ -227,24 +224,9 @@ public async Task ThenMessageAreUploadedToStorageService()
                         var data = Encoding.UTF8.GetString(memoryStream.ToArray());
 
                         var hl7Message = new HL7.Dotnetcore.Message(data);
-                        hl7Message.ParseMessage();
-
-                        foreach (var key in _input.Keys)
-                        {
-                            if (hl7Message.SerializeMessage(true).Equals(_input[key].SerializeMessage(true)))
-                            {
-                                matchFound = true;
-                                break;
-                            }
-                        }
-
+                        hl7Message.ParseMessage().Should().BeTrue();
                     });
                 await minioClient.GetObjectAsync(getObjectArgs);
-                if (retryCount++ < 3 && !matchFound)
-                {
-                    goto RetryVerifyFileUpload;
-                }
-                matchFound.Should().BeTrue();
             }
         }
     }