diff --git a/iothub/device/src/Pipeline/PipelineContext.cs b/iothub/device/src/Pipeline/PipelineContext.cs
index 37a3508853..89fd80c014 100644
--- a/iothub/device/src/Pipeline/PipelineContext.cs
+++ b/iothub/device/src/Pipeline/PipelineContext.cs
@@ -9,7 +9,7 @@ namespace Microsoft.Azure.Devices.Client
 {
     internal class PipelineContext
     {
-        internal ITransportSettings TransportSettings { get; set; }
+        internal ITransportSettings TransportSettingsSelected { get; set; }
 
         internal ITransportSettings[] TransportSettingsArray { get; set; }
 
diff --git a/iothub/device/src/Pipeline/ProtocolRoutingDelegatingHandler.cs b/iothub/device/src/Pipeline/ProtocolRoutingDelegatingHandler.cs
index 2da392714d..d3fbfebaca 100644
--- a/iothub/device/src/Pipeline/ProtocolRoutingDelegatingHandler.cs
+++ b/iothub/device/src/Pipeline/ProtocolRoutingDelegatingHandler.cs
@@ -99,7 +99,7 @@ private void SelectTransport()
                         $"{nameof(ProtocolRoutingDelegatingHandler)}.{nameof(OpenAsync)}");
 
                 // Configure the transportSettings for this context (Important! Within Context, 'ITransportSettings' != 'ITransportSettings[]').
-                Context.TransportSettings = transportSettings;
+                Context.TransportSettingsSelected = transportSettings;
                 CreateNewTransportHandler();
 
                 _nextTransportIndex++;
diff --git a/iothub/device/src/Pipeline/TransportHandlerFactory.cs b/iothub/device/src/Pipeline/TransportHandlerFactory.cs
index a20b7fa671..b0e693abb2 100644
--- a/iothub/device/src/Pipeline/TransportHandlerFactory.cs
+++ b/iothub/device/src/Pipeline/TransportHandlerFactory.cs
@@ -16,7 +16,7 @@ public IDelegatingHandler Create(PipelineContext context)
         {
             // ProtocolRoutingDelegatingHandler configures the ITransportSettings configuration
             // which is different from ITransportSettings[] element.
-            ITransportSettings transportSetting = context.TransportSettings;
+            ITransportSettings transportSetting = context.TransportSettingsSelected;
             IotHubConnectionString connectionString = context.IotHubConnectionString;
             InternalClient.OnMethodCalledDelegate onMethodCallback = context.MethodCallback;
             Action<TwinCollection> onDesiredStatePatchReceived = context.DesiredPropertyUpdateCallback;