diff --git a/src/app/action/controllers/PreProcessActionController.php b/src/app/action/controllers/PreProcessActionController.php
index 937983f9d9fe1c50f003a2876127d04dd2a840e1..39d17eea3459ba6aff0f9712739eaa6109c42d90 100755
--- a/src/app/action/controllers/PreProcessActionController.php
+++ b/src/app/action/controllers/PreProcessActionController.php
@@ -632,6 +632,8 @@ class PreProcessActionController
         $mailevaConfig = CoreConfigModel::getMailevaConfiguration();
         if (empty($mailevaConfig)) {
             return $response->withStatus(400)->withJson(['errors' => 'Maileva configuration does not exist', 'errorLang' => 'missingMailevaConfig']);
+        } elseif (!$mailevaConfig['enabled']) {
+            return $response->withStatus(400)->withJson(['errors' => 'Maileva configuration is disabled', 'errorLang' => 'disabledMailevaConfig']);
         }
 
         $data = $request->getParsedBody();
diff --git a/src/app/action/controllers/ShippingTrait.php b/src/app/action/controllers/ShippingTrait.php
index 186080182e7bd1d5ffef2434d16934ee013aea5b..4de6d9e7cc9639fba9d094fba29aaf58e37125f4 100644
--- a/src/app/action/controllers/ShippingTrait.php
+++ b/src/app/action/controllers/ShippingTrait.php
@@ -49,6 +49,8 @@ trait ShippingTrait
         $mailevaConfig = CoreConfigModel::getMailevaConfiguration();
         if (empty($mailevaConfig)) {
             return ['errors' => ['Maileva configuration does not exist']];
+        } elseif (!$mailevaConfig['enabled']) {
+            return ['errors' => ['Maileva configuration is disabled']];
         }
         $shippingTemplate = ShippingTemplateModel::getById(['id' => $args['data']['shippingTemplateId']]);
         if (empty($shippingTemplate)) {
diff --git a/src/frontend/lang/lang-en.ts b/src/frontend/lang/lang-en.ts
index 9c2dbd66361e0a06d4c52772cfd3d4c541182425..77f411604265297dbcd1c7f2e496d176773558f8 100755
--- a/src/frontend/lang/lang-en.ts
+++ b/src/frontend/lang/lang-en.ts
@@ -539,6 +539,7 @@ export const LANG_EN = {
     "missingBasket"                         : "Select the baskets wish you want to delete the redirection.",
     "missingChoose"                         : "Do you want to reactivate your account ?",
     "missingMailevaConfig"                  : "Maileva configuration does not exist",
+    "disabledMailevaConfig"                 : "Maileva configuration is disabled",
     "modelUpdated"                          : "Model updated",
     "modificationSaved"                     : "Modification has been saved",
     "modifiedBy"                            : "Modified by",
diff --git a/src/frontend/lang/lang-fr.ts b/src/frontend/lang/lang-fr.ts
index b20bab02a6f32b04b79d2034a4b1c171c8acc524..27d97e54c31c53a6cb47b4f30c47f0e1c9a006ec 100755
--- a/src/frontend/lang/lang-fr.ts
+++ b/src/frontend/lang/lang-fr.ts
@@ -565,6 +565,7 @@ export const LANG_FR = {
     "missingBasket"                         : "Sélectionner les bannettes pour lesquelles vous souhaitez supprimer la redirection :",
     "missingChoose"                         : "Souhaitez-vous réactiver votre compte ?",
     "missingMailevaConfig"                  : "La configuration Maileva n'existe pas",
+    "disabledMailevaConfig"                 : "La configuration Maileva est désactivé",
     "modelUpdated"                          : "Le Modèle a été mis à jour",
     "modificationSaved"                     : "Modification enregistrée",
     "modifiedBy"                            : "Modifié par",
diff --git a/src/frontend/lang/lang-nl.ts b/src/frontend/lang/lang-nl.ts
index 498ca31249b8600e0955a2b2c2373f17f13e092e..20d4bd5e858b9e81cf085f4a25d5e79d9ee62820 100755
--- a/src/frontend/lang/lang-nl.ts
+++ b/src/frontend/lang/lang-nl.ts
@@ -555,6 +555,7 @@ export const LANG_NL = {
     "missingBasket"                         : "_TO_TRANSLATE",
     "missingChoose"                         : "Wenst u uw account opnieuw te activeren?",
     "missingMailevaConfig"                  : "Maileva configuration does not exist _TO_TRANSLATE",
+    "disabledMailevaConfig"                 : "Maileva configuration is disabled",//TRANSLATE
     "modelUpdated"                          : "Het model werd bijgewerkt",
     "modificationSaved"                     : "Wijziging bewaard",
     "modifiedBy"                            : "Modified by", //_TO_TRANSLATE