diff --git a/app/views/wds_servers/_image_select.html.erb b/app/views/wds_servers/_image_select.html.erb
index 8ec768b210cc4beec536bbb2c6560f3c5344320c..c4e23ba641f09f6973937f80ddefce5bc292a0cb 100644
--- a/app/views/wds_servers/_image_select.html.erb
+++ b/app/views/wds_servers/_image_select.html.erb
@@ -3,7 +3,7 @@
     host = @host || f.object.host
     server = host.public_send(:wds_server) rescue nil
     images = server.all_images rescue []
-    images = images.select { |img| img.matches_architecture? host.architecture } if host.architecture
+    images = images.select { |img| img.matches_architecture?(host.architecture) && img.enabled } if host.architecture
     boot_images = images.select { |img| img.is_a?(ForemanWds::WdsBootImage) }
     install_images = images.select { |img| img.is_a?(ForemanWds::WdsInstallImage) }
     install_images = install_images.select { |img| img.version == "#{host.operatingsystem.major}.#{host.operatingsystem.minor}" } if host.operatingsystem