diff --git a/app/Libraries/MultiDB.php b/app/Libraries/MultiDB.php
index dd5237f35ec9..69f0aee00db9 100644
--- a/app/Libraries/MultiDB.php
+++ b/app/Libraries/MultiDB.php
@@ -192,6 +192,7 @@ class MultiDB
                 return true;
             
         }
+        self::setDefaultDatabase();
 
         return false;
     }
@@ -205,6 +206,7 @@ class MultiDB
                 return true;
             }
         }
+        self::setDefaultDatabase();
 
         return false;
     }
@@ -218,6 +220,7 @@ class MultiDB
                 return true;
             }
         }
+        self::setDefaultDatabase();
 
         return false;
     }
@@ -230,6 +233,7 @@ class MultiDB
                 return true;
             }
         }
+        self::setDefaultDatabase();
 
         return false;
     }
@@ -242,6 +246,7 @@ class MultiDB
                 return true;
             }
         }
+        self::setDefaultDatabase();
 
         return false;
     }
diff --git a/app/PaymentDrivers/CheckoutCom/CreditCard.php b/app/PaymentDrivers/CheckoutCom/CreditCard.php
index a1deb8422044..0a03f639aa75 100644
--- a/app/PaymentDrivers/CheckoutCom/CreditCard.php
+++ b/app/PaymentDrivers/CheckoutCom/CreditCard.php
@@ -141,7 +141,7 @@ class CreditCard
         $this->checkout->payment_hash->data = array_merge((array)$this->checkout->payment_hash->data, ['checkout_payment_ref' => $payment]);
         $this->checkout->payment_hash->save();
 
-        if ($this->checkout->client->currency()->code === 'EUR') {
+        if ($this->checkout->client->currency()->code == 'EUR') {
             $payment->{'3ds'} = ['enabled' => true];
 
             $payment->{'success_url'} = route('payment_webhook', [