From eec6722cf4c13c178f89032fcac0a4895641f5f1 Mon Sep 17 00:00:00 2001
From: Daniel Shokouhi <dshokouhi@gmail.com>
Date: Sat, 22 Sep 2018 02:34:46 -0700
Subject: [PATCH] Fix return to base logic for neato (#16776)

---
 homeassistant/components/vacuum/neato.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/homeassistant/components/vacuum/neato.py b/homeassistant/components/vacuum/neato.py
index dd27b2a33d2..2b601f9fb05 100644
--- a/homeassistant/components/vacuum/neato.py
+++ b/homeassistant/components/vacuum/neato.py
@@ -188,6 +188,8 @@ class NeatoConnectedVacuum(StateVacuumDevice):
 
     def return_to_base(self, **kwargs):
         """Set the vacuum cleaner to return to the dock."""
+        if self._clean_state == STATE_CLEANING:
+            self.robot.pause_cleaning()
         self._clean_state = STATE_RETURNING
         self.robot.send_to_base()