diff --git a/Disco.BI/BI/Extensions/JobActionExtensions.cs b/Disco.BI/BI/Extensions/JobActionExtensions.cs
index 14b3be1e..84506a98 100644
--- a/Disco.BI/BI/Extensions/JobActionExtensions.cs
+++ b/Disco.BI/BI/Extensions/JobActionExtensions.cs
@@ -210,7 +210,7 @@ namespace Disco.BI.Extensions
             var jobComponents = new List<DeviceComponent>();
             foreach (var component in components)
             {
-                if (!component.DeviceModelId.HasValue)
+                if (component.JobSubTypes.Count == 0)
                 {
                     jobComponents.Add(component);
                 }