diff --git a/composer.json b/composer.json
index 905e285..0a883e8 100644
--- a/composer.json
+++ b/composer.json
@@ -40,4 +40,4 @@
       "Unzer\\UnzerPayment\\": "./src/"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/Controller/PaymentController.php b/src/Controller/PaymentController.php
index 5ffc6e8..5d2f75a 100644
--- a/src/Controller/PaymentController.php
+++ b/src/Controller/PaymentController.php
@@ -87,4 +87,15 @@ public function getPaymentList()
 
         return $paymentList;
     }
-}
\ No newline at end of file
+
+    /**
+     * Checks if paymentId is an unzer payment
+     *
+     * @return bool
+     *
+     */
+    public function isUnzerPaymentMethod(string $paymentId): bool
+    {
+        return UnzerpaymentHelper::getInstance()->isUnzerPaymentMethod($paymentId);
+    }
+}
diff --git a/views/twig/extensions/themes/default/page/checkout/inc/payment_other.html.twig b/views/twig/extensions/themes/default/page/checkout/inc/payment_other.html.twig
deleted file mode 100644
index 39970c6..0000000
--- a/views/twig/extensions/themes/default/page/checkout/inc/payment_other.html.twig
+++ /dev/null
@@ -1,18 +0,0 @@
-<div class="payment-option" style="margin-bottom: 3px;">
-    <div class="payment-option-form">
-        <input class="form-check-input" id="payment_{{ sPaymentID }}" type="radio" name="paymentid" value="{{ sPaymentID }}" {% if oView.getCheckedPaymentId() == paymentmethod.oxpayments__oxid.value %}checked{% endif %}>
-        <label class="form-check-label" for="payment_{{ sPaymentID }}">
-            <img src="{{ paymentmethod.getIcon() }}" style="max-width: 40px; height: auto; vertical-align: middle">
-            {{ paymentmethod.oxpayments__oxdesc.value }}
-        </label>
-    </div>
-    <div class="payment-option-info{% if oView.getCheckedPaymentId() == paymentmethod.oxpayments__oxid.value %} activePayment{% endif %}">
-        {% block checkout_payment_longdesc %}
-            {% if paymentmethod.oxpayments__oxlongdesc.value|striptags|trim %}
-                <div class="desc">
-                    {{ paymentmethod.oxpayments__oxlongdesc.getRawValue() }}
-                </div>
-            {% endif %}
-        {% endblock %}
-    </div>
-</div>
\ No newline at end of file
diff --git a/views/twig/extensions/themes/default/page/checkout/payment.html.twig b/views/twig/extensions/themes/default/page/checkout/payment.html.twig
new file mode 100644
index 0000000..649a2c8
--- /dev/null
+++ b/views/twig/extensions/themes/default/page/checkout/payment.html.twig
@@ -0,0 +1,26 @@
+{% extends "page/checkout/payment.html.twig" %}
+
+{% block select_payment %}
+
+    {% if oView.isUnzerPaymentMethod(sPaymentID) %}
+        <div class="payment-option" style="margin-bottom: 3px;">
+            <div class="payment-option-form">
+                <input class="form-check-input" id="payment_{{ sPaymentID }}" type="radio" name="paymentid" value="{{ sPaymentID }}" {% if oView.getCheckedPaymentId() == paymentmethod.oxpayments__oxid.value %}checked{% endif %}>
+                <label class="form-check-label" for="payment_{{ sPaymentID }}">
+                    <img src="{{ paymentmethod.getIcon() }}" style="max-width: 40px; height: auto; vertical-align: middle">
+                    {{ paymentmethod.oxpayments__oxdesc.value }}
+                </label>
+            </div>
+            <div class="payment-option-info{% if oView.getCheckedPaymentId() == paymentmethod.oxpayments__oxid.value %} activePayment{% endif %}">
+                {% if paymentmethod.oxpayments__oxlongdesc.value|striptags|trim %}
+                    <div class="desc">
+                        {{ paymentmethod.oxpayments__oxlongdesc.getRawValue() }}
+                    </div>
+                {% endif %}
+            </div>
+        </div>
+    {% else %}
+        {{ parent() }}
+    {% endif %}
+
+{% endblock %}