diff --git a/Snowflake.Data.Tests/UnitTests/SFFileTransferAgentTests.cs b/Snowflake.Data.Tests/UnitTests/SFFileTransferAgentTests.cs
index d9f52b82c..bdc5a3cff 100644
--- a/Snowflake.Data.Tests/UnitTests/SFFileTransferAgentTests.cs
+++ b/Snowflake.Data.Tests/UnitTests/SFFileTransferAgentTests.cs
@@ -8,7 +8,6 @@ namespace Snowflake.Data.Tests.UnitTests
     using Snowflake.Data.Core;
     using Snowflake.Data.Core.FileTransfer;
     using System.Collections.Generic;
-    using Snowflake.Data.Tests.Mock;
     using System.Threading.Tasks;
     using System.Threading;
     using System.IO;
diff --git a/Snowflake.Data/Core/FileTransfer/SFFileTransferAgent.cs b/Snowflake.Data/Core/FileTransfer/SFFileTransferAgent.cs
index 28d2648f3..43f62fbdc 100644
--- a/Snowflake.Data/Core/FileTransfer/SFFileTransferAgent.cs
+++ b/Snowflake.Data/Core/FileTransfer/SFFileTransferAgent.cs
@@ -596,7 +596,7 @@ private void initFileMetadata(
 
                     /// The storage client used to upload data from files or streams
                     /// This is only needed for remote storage types
-                    if (TransferMetadata.stageInfo.locationType != LOCAL_FS)
+                    if (StorageClientType.REMOTE == GetStorageClientType(TransferMetadata.stageInfo))
                     {
                         fileMetadata.client = SFRemoteStorageUtil.GetRemoteStorage(TransferMetadata);
                     }
@@ -661,7 +661,7 @@ private void initFileMetadata(
 
                     /// The storage client used to download data from files or streams
                     /// This is only needed for remote storage types
-                    if (TransferMetadata.stageInfo.locationType != LOCAL_FS)
+                    if (StorageClientType.REMOTE == GetStorageClientType(TransferMetadata.stageInfo))
                     {
                         fileMetadata.client = SFRemoteStorageUtil.GetRemoteStorage(TransferMetadata);