diff --git a/templates/checkout/_partials/steps/payment.tpl b/templates/checkout/_partials/steps/payment.tpl
index 420a588..21ae1ad 100644
--- a/templates/checkout/_partials/steps/payment.tpl
+++ b/templates/checkout/_partials/steps/payment.tpl
@@ -21,17 +21,19 @@
         {foreach from=$payment_options item="module_options"}
           {foreach from=$module_options item="option"}
             <div>
-              <div id="{$option.id}-container" class="payment-option clearfix">
+              <div id="{$option.id}-container" class="payment-option clearfix
+              {if ($selected_payment_option == $option.id || (isset($is_free) && $is_free) ) || ($payment_options|@count === 1 && $module_options|@count === 1)} hidden {/if}"
+              >
                 {* This is the way an option should be selected when Javascript is enabled *}
                 <span class="custom-radio float-xs-left">
                   <input
-                    class="ps-shown-by-js {if $option.binary} binary {/if}"
+                    class="ps-shown-by-js {if $option.binary} binary {/if}""
                     id="{$option.id}"
                     data-module-name="{$option.module_name}"
                     name="payment-option"
                     type="radio"
                     required
-                    {if $selected_payment_option == $option.id || $is_free} checked {/if}
+                    {if ($selected_payment_option == $option.id || (isset($is_free) && $is_free) ) || ($payment_options|@count === 1 && $module_options|@count === 1)} checked {/if}
                   >
                   <span></span>
                 </span>