diff --git a/templates/inspector_dnsmasq_http.erb b/templates/inspector_dnsmasq_http.erb
index de99c9d6..d68db179 100644
--- a/templates/inspector_dnsmasq_http.erb
+++ b/templates/inspector_dnsmasq_http.erb
@@ -20,9 +20,10 @@ dhcp-option=option:router,<%= s['gateway'] %>
 dhcp-sequential-ip
 dhcp-match=ipxe,175
 dhcp-match=set:efi,option:client-arch,7
-# Client is running iPXE; move to next stage of chainloading
+dhcp-match=set:efi,option:client-arch,9
+# Client is already running iPXE; move to next stage of chainloading
 dhcp-boot=tag:ipxe,http://<%= @dnsmasq_local_ip %>:<%= @http_port_real %>/inspector.ipxe
-# Client is running PXE over EFI; send EFI version of iPXE chainloader
-dhcp-boot=tag:efi,ipxe.efi
+# Client is PXE booting over EFI without iPXE ROM; send EFI version of iPXE chainloader
+dhcp-boot=tag:efi,tag:!ipxe,ipxe.efi
 # Client is running PXE over BIOS; send BIOS version of iPXE chainloader
 dhcp-boot=undionly.kpxe,localhost.localdomain,<%= @dnsmasq_local_ip %>