diff --git a/src/Sitecore.Support.315324/InjectCompositeComponents.cs b/src/Sitecore.Support.315324/InjectCompositeComponents.cs
index 61f38ee..f93973f 100644
--- a/src/Sitecore.Support.315324/InjectCompositeComponents.cs
+++ b/src/Sitecore.Support.315324/InjectCompositeComponents.cs
@@ -12,6 +12,13 @@ public override IList<XElement> GetDevices(XElement layoutXml, ID contextDeviceI
     {
       var allDevices = layoutXml.Descendants("d").ToList();
 
+      #region fix
+      if (!allDevices.Any())
+      {
+        return new List<XElement>();
+      }
+      #endregion
+
       var filteredDevices = FilterDevicesByDeviceId(allDevices, contextDeviceId);
       if (!filteredDevices.Any() && Context.Device.FallbackDevice != null)
       {