diff --git ubercart/payment/uc_paypal/uc_paypal.module ubercart/payment/uc_paypal/uc_paypal.module
index 677a9da..dafc670 100644
--- ubercart/payment/uc_paypal/uc_paypal.module
+++ ubercart/payment/uc_paypal/uc_paypal.module
@@ -111,8 +111,11 @@ function uc_paypal_form_alter(&$form, $form_state, $form_id) {
     $form['#submit'][] = 'uc_paypal_ec_checkout';
   }
 
-  if ($form_id == 'uc_cart_checkout_review_form' && !empty($_SESSION['TOKEN'])) {
-    $form['#submit'][] = 'uc_paypal_ec_submit_form_submit';
+  if ($form_id == 'uc_cart_checkout_review_form' && !empty($_SESSION['TOKEN']) && ($order_id = intval($_SESSION['cart_order'])) > 0) {
+    $order = uc_order_load($order_id);
+    if ($order->payment_method == 'paypal_ec') {
+      $form['#submit'][] = 'uc_paypal_ec_submit_form_submit';
+    }
   }
 }