diff --git a/EventProcessor/EventProcessor.WebJob/Processors/DeviceAdministrationProcessor.cs b/EventProcessor/EventProcessor.WebJob/Processors/DeviceAdministrationProcessor.cs
index cbd91e41..b597ae72 100644
--- a/EventProcessor/EventProcessor.WebJob/Processors/DeviceAdministrationProcessor.cs
+++ b/EventProcessor/EventProcessor.WebJob/Processors/DeviceAdministrationProcessor.cs
@@ -78,6 +78,11 @@ namespace Microsoft.Azure.Devices.Applications.RemoteMonitoring.EventProcessor.W
                     {
                         foreach (DeviceModel resultItem in results)
                         {
+                            if (string.IsNullOrWhiteSpace(resultItem.DeviceProperties.DeviceID))
+                            {
+                                resultItem.DeviceProperties.DeviceID = message.SystemProperties["iothub-connection-device-id"].ToString();
+                            }
+
                             await ProcessEventItem(resultItem);
                         }
                     }