diff --git a/app/overrides/modify_shipping_options_display.rb b/app/overrides/modify_shipping_options_display.rb
index 148f6ec..e05104a 100644
--- a/app/overrides/modify_shipping_options_display.rb
+++ b/app/overrides/modify_shipping_options_display.rb
@@ -20,7 +20,9 @@ Deface::Override.new(:virtual_path => "spree/checkout/_delivery",
   <%== t 'digital_shipping', :email => @order.email %> (<%= number_to_currency @order.digital_shipping_method[:cost] %>)
 </label>
 <% else %>
-<% @order.rate_hash.each do |shipping_method| %>
+<% filtered_rate_hash = @order.rate_hash.select { |m| !(@order.digital_shipping_method && shipping_method[:id] == @order.digital_shipping_method[:id]) } %>
+<% if filtered_rate_hash.count > 0 %>
+<% filtered_rate_hash.each do |shipping_method| %>
 <% next if @order.digital_shipping_method && shipping_method[:id] == @order.digital_shipping_method[:id] %>
   <label>
     <%= radio_button(:order, :shipping_method_id, shipping_method[:id]) %>
@@ -31,5 +33,8 @@ Deface::Override.new(:virtual_path => "spree/checkout/_delivery",
     <% end %>
   </label>
 <% end %>
+<% else %>
+<%= t :no_shipping_methods %>
+<% end %>
 <% end %>
 })
\ No newline at end of file