diff --git a/src/Services/Manager.vala b/src/Services/Manager.vala
index 2e34f60a..bc164622 100644
--- a/src/Services/Manager.vala
+++ b/src/Services/Manager.vala
@@ -115,7 +115,7 @@ public class BluetoothIndicator.Services.ObjectManager : Object {
             ((DBusProxy) adapter).g_properties_changed.connect ((changed, invalid) => {
                 var powered = changed.lookup_value ("Powered", new VariantType ("b"));
                 if (powered != null) {
-                    set_global_state.begin (powered.get_boolean ());
+                    set_last_state.begin ();
                 }
             });
         }
@@ -217,7 +217,6 @@ public class BluetoothIndicator.Services.ObjectManager : Object {
         }
 
         settings.set_boolean ("bluetooth-enabled", state);
-        check_global_state ();
     }
 
     public async void set_last_state () {