diff --git a/AutoAwayStatusLinux/awayl.py b/AutoAwayStatusLinux/awayl.py
index 7805af8..f30c531 100644
--- a/AutoAwayStatusLinux/awayl.py
+++ b/AutoAwayStatusLinux/awayl.py
@@ -56,9 +56,10 @@ class AutoAwayStatusLinux(plugin_super_class.PluginSuperClass):
         self.save_settings('{"time": ' + str(self._time) + '}')
 
     def change_status(self, status=1):
-        if self._profile.status != 1:
+        if self._profile.status in (0, 2):
             self._prev_status = self._profile.status
-        invoke_in_main_thread(self._profile.set_status, status)
+        if status is not None:
+            invoke_in_main_thread(self._profile.set_status, status)
 
     def get_window(self):
         inst = self
diff --git a/AutoAwayStatusWindows/awayw.py b/AutoAwayStatusWindows/awayw.py
index fd79f3e..062cf80 100644
--- a/AutoAwayStatusWindows/awayw.py
+++ b/AutoAwayStatusWindows/awayw.py
@@ -68,9 +68,10 @@ class AutoAwayStatusWindows(plugin_super_class.PluginSuperClass):
         self.save_settings('{"time": ' + str(self._time) + '}')
 
     def change_status(self, status=1):
-        if self._profile.status != 1:
+        if self._profile.status in (0, 2):
             self._prev_status = self._profile.status
-        invoke_in_main_thread(self._profile.set_status, status)
+        if status is not None:
+            invoke_in_main_thread(self._profile.set_status, status)
 
     def get_window(self):
         inst = self