diff --git a/src/MTConnect.NET-Applications-Agents/MTConnectHttpAgentGatewayApplication.cs b/src/MTConnect.NET-Applications-Agents/MTConnectHttpAgentGatewayApplication.cs
index c2b0f50e..ad23b249 100644
--- a/src/MTConnect.NET-Applications-Agents/MTConnectHttpAgentGatewayApplication.cs
+++ b/src/MTConnect.NET-Applications-Agents/MTConnectHttpAgentGatewayApplication.cs
@@ -254,7 +254,8 @@ private void StreamsDocumentReceived(MTConnectHttpClient client, IStreamsRespons
                             input.Timestamp = observation.Timestamp.ToUnixTime();
                             input.Values = observation.Values;
 
-                            Agent.AddObservation(stream.Uuid, input);
+                            Agent.AddObservation(client.Device, input);
+                            //Agent.AddObservation(stream.Uuid, input);
                         }
                     }
                 }
@@ -269,7 +270,8 @@ private void AssetsDocumentReceived(MTConnectHttpClient client, IAssetsResponseD
 
                 foreach (var asset in document.Assets)
                 {
-                    Agent.AddAsset(asset.DeviceUuid, asset);
+                    Agent.AddAsset(client.Device, asset);
+                    //Agent.AddAsset(asset.DeviceUuid, asset);
                 }
             }
         }