diff --git a/uc_cart/lib/Drupal/uc_cart/Tests/CartSettingsTest.php b/uc_cart/lib/Drupal/uc_cart/Tests/CartSettingsTest.php
index d37037b..59689aa 100644
--- a/uc_cart/lib/Drupal/uc_cart/Tests/CartSettingsTest.php
+++ b/uc_cart/lib/Drupal/uc_cart/Tests/CartSettingsTest.php
@@ -22,6 +22,19 @@ class CartSettingsTest extends UbercartTestBase {
     );
   }
 
+  public function testAddToCartMessage() {
+    $this->drupalLogin($this->adminUser);
+
+    $this->addToCart($this->product);
+    $this->assertText($this->product->getTitle() . ' added to your shopping cart.');
+
+    $this->drupalPostForm('cart', array(), 'Remove');
+    $this->drupalPostForm('admin/store/settings/cart', array('uc_cart_add_item_msg' => FALSE), 'Save configuration');
+
+    $this->addToCart($this->product);
+    $this->assertNoText($this->product->getTitle() . ' added to your shopping cart.');
+  }
+
   public function testAddToCartRedirect() {
     $this->drupalLogin($this->adminUser);
     $this->drupalGet('admin/store/settings/cart');
diff --git a/uc_product/uc_product.module b/uc_product/uc_product.module
index c9c2ee8..1471c4d 100644
--- a/uc_product/uc_product.module
+++ b/uc_product/uc_product.module
@@ -968,7 +968,9 @@ function uc_catalog_buy_it_now_form_validate($form, &$form_state) {
  * @see uc_catalog_buy_it_now_form_validate()
  */
 function uc_catalog_buy_it_now_form_submit($form, &$form_state) {
-  $form_state['redirect'] = uc_cart_add_item($form_state['values']['nid'], 1,  \Drupal::moduleHandler()->invokeAll('uc_add_to_cart_data', array($form_state['values'])), NULL, variable_get('uc_cart_add_item_msg', TRUE));
+  $data = \Drupal::moduleHandler()->invokeAll('uc_add_to_cart_data', array($form_state['values']));
+  $msg = \Drupal::config('uc_cart.settings')->get('add_item_msg');
+  $form_state['redirect'] = uc_cart_add_item($form_state['values']['nid'], 1, $data, NULL, $msg);
 }
 
 /**
@@ -1019,7 +1021,8 @@ function uc_product_add_to_cart_form($form, &$form_state, $node) {
  * Form validation handler for uc_product_add_to_cart_form().
  */
 function uc_product_add_to_cart_form_validate($form, &$form_state) {
-  $form_state['storage']['variant'] = uc_product_load_variant($form_state['values']['nid'], \Drupal::moduleHandler()->invokeAll('uc_add_to_cart_data', array($form_state['values'])));
+  $data = \Drupal::moduleHandler()->invokeAll('uc_add_to_cart_data', array($form_state['values']));
+  $form_state['storage']['variant'] = uc_product_load_variant($form_state['values']['nid'], $data);
 }
 
 /**
@@ -1028,7 +1031,9 @@ function uc_product_add_to_cart_form_validate($form, &$form_state) {
  * @see uc_product_add_to_cart_form()
  */
 function uc_product_add_to_cart_form_submit($form, &$form_state) {
-  $form_state['redirect'] = uc_cart_add_item($form_state['values']['nid'], $form_state['values']['qty'],  \Drupal::moduleHandler()->invokeAll('uc_add_to_cart_data', array($form_state['values'])), NULL, variable_get('uc_cart_add_item_msg', TRUE));
+  $data = \Drupal::moduleHandler()->invokeAll('uc_add_to_cart_data', array($form_state['values']));
+  $msg = \Drupal::config('uc_cart.settings')->get('add_item_msg');
+  $form_state['redirect'] = uc_cart_add_item($form_state['values']['nid'], $form_state['values']['qty'], $data, NULL, $msg);
 }
 
 /**
diff --git a/uc_product_kit/uc_product_kit.module b/uc_product_kit/uc_product_kit.module
index d042bd9..b558d63 100644
--- a/uc_product_kit/uc_product_kit.module
+++ b/uc_product_kit/uc_product_kit.module
@@ -791,7 +791,7 @@ function uc_product_kit_add_to_cart_form_validate($form, &$form_state) {
  * @see uc_product_kit_add_to_cart_form()
  */
 function uc_product_kit_add_to_cart_form_submit($form, &$form_state) {
-  if (variable_get('uc_cart_add_item_msg', TRUE)) {
+  if (\Drupal::config('uc_cart.settings')->get('add_item_msg')) {
     $node = node_load($form_state['values']['nid']);
     drupal_set_message(t('<strong>@product-title</strong> added to <a href="!url">your shopping cart</a>.', array('@product-title' => $node->label(), '!url' => url('cart'))));
   }
@@ -879,7 +879,8 @@ function uc_product_kit_buy_it_now_form_submit($form, &$form_state) {
       }
     }
   }
-  $form_state['redirect'] = uc_cart_add_item($form_state['values']['nid'], 1, $form_state['values'], NULL, variable_get('uc_cart_add_item_msg', TRUE));
+  $msg = \Drupal::config('uc_cart.settings')->get('add_item_msg');
+  $form_state['redirect'] = uc_cart_add_item($form_state['values']['nid'], 1, $form_state['values'], NULL, $msg);
 }
 
 /**