diff --git a/src/Plugin/Commerce/PaymentGateway/Datatrans.php b/src/Plugin/Commerce/PaymentGateway/Datatrans.php
index cccc32e1440d4927bc9a0cf3d2cc68ffe90e8d70..41b380011f62ee3841c7de41dd93b578d4318893 100644
--- a/src/Plugin/Commerce/PaymentGateway/Datatrans.php
+++ b/src/Plugin/Commerce/PaymentGateway/Datatrans.php
@@ -402,9 +402,11 @@ class Datatrans extends OffsitePaymentGatewayBase {
       'expy' => $payment_details['expy'],
     ]);
 
-    $expires = CreditCard::calculateExpirationTimestamp($payment_details['expm'], $payment_details['expy']);
     $payment_method->setRemoteId($payment_details['aliasCC']);
-    $payment_method->setExpiresTime($expires);
+    if (!empty($payment_details['expm']) && !empty($payment_details['expy'])) {
+      $expires = CreditCard::calculateExpirationTimestamp($payment_details['expm'], $payment_details['expy']);
+      $payment_method->setExpiresTime($expires);
+    }
     $payment_method->save();
     return $payment_method;
   }