diff --git a/app/views/teardowns/_devices_part.html.slim b/app/views/teardowns/_devices_part.html.slim
index 0cce4eee8..e098e5bca 100644
--- a/app/views/teardowns/_devices_part.html.slim
+++ b/app/views/teardowns/_devices_part.html.slim
@@ -1,14 +1,14 @@
-- if @metadata.release_type == AppInfo::IPA::ExportType::ADHOC
+- if devices.present?
   .card
     .card-header
       h3.card-title
-        = t('teardowns.show.devise_list', count: @metadata.devices.size)
+        = t('teardowns.show.devise_list', count: devices.size)
       .card-tools
         button.btn.btn-tool data-card-widget="collapse"
           i.fas.fa-minus
     .card-body.p-0.pl-3
       table.table
-        - @metadata.devices.each do |udid|
+        - devices.sort.each do |udid|
           tr
             td
               span = udid
diff --git a/app/views/teardowns/_ios.html.slim b/app/views/teardowns/_ios.html.slim
index fec61ae99..ee0965054 100644
--- a/app/views/teardowns/_ios.html.slim
+++ b/app/views/teardowns/_ios.html.slim
@@ -31,7 +31,7 @@
         dd
           pre = number_to_human_size(@metadata.size)
 
-  == render 'devices_part'
+  == render 'devices_part', devices: @metadata.devices
   == render 'card', title: t('teardowns.show.capabilities'), raw: @metadata.capabilities
 
 .col-md-6