diff --git a/addons/hw_drivers/controllers/driver.py b/addons/hw_drivers/controllers/driver.py
index 7326381d6de..76c4899d254 100755
--- a/addons/hw_drivers/controllers/driver.py
+++ b/addons/hw_drivers/controllers/driver.py
@@ -474,6 +474,11 @@ if terminal_id:
     eftapi = ctypes.CDLL("eftapi.so")  # Library given by Six
     mpdm.daemon = True
     mpdm.start()
+else:
+    try:
+        subprocess.check_call(["pkill", "9", "eftdvs"])  # Check if MPD server is running
+    except subprocess.CalledProcessError:
+        pass
 
 m = Manager()
 m.daemon = True
diff --git a/addons/point_of_sale/static/src/js/screens.js b/addons/point_of_sale/static/src/js/screens.js
index 42322607563..d22e9dd7f6a 100644
--- a/addons/point_of_sale/static/src/js/screens.js
+++ b/addons/point_of_sale/static/src/js/screens.js
@@ -2029,6 +2029,7 @@ var PaymentScreenWidget = ScreenWidget.extend({
                     line.set_amount(0);
                     line.set_payment_status('reversed');
                 } else {
+                    line.can_be_reversed = false;
                     line.set_payment_status('done');
                 }
                 self.render_paymentlines();