diff --git a/modules/payment/src/Element/PaymentGatewayForm.php b/modules/payment/src/Element/PaymentGatewayForm.php
index 42639b03af..fda1ea9c6b 100644
--- a/modules/payment/src/Element/PaymentGatewayForm.php
+++ b/modules/payment/src/Element/PaymentGatewayForm.php
@@ -6,7 +6,7 @@
 use Drupal\commerce_payment\Entity\EntityWithPaymentGatewayInterface;
 use Drupal\commerce_payment\Exception\PaymentGatewayException;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Render\Element\FormElement;
+use Drupal\Core\Render\Element\RenderElement;
 
 /**
  * Provides a form element for embedding the payment gateway forms.
@@ -25,7 +25,7 @@
  *
  * @RenderElement("commerce_payment_gateway_form")
  */
-class PaymentGatewayForm extends FormElement {
+class PaymentGatewayForm extends RenderElement {
 
   use CommerceElementTrait;