diff --git a/flake.lock b/flake.lock
index b3e4531..3544dd7 100644
--- a/flake.lock
+++ b/flake.lock
@@ -42,16 +42,15 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1789876218,
-        "narHash": "sha256-/sUFGNLvcwf9MxGw+QS24o1bg217fQRY9NpinlmSjH4=",
-        "owner": "Henry-Hiles",
+        "lastModified": 1774860670,
+        "narHash": "sha256-YjJkQrvxrErXtfDi3obUn6rNmkA+CIAZ3f5NgL5xuYE=",
+        "owner": "neobrain",
         "repo": "nix2flatpak",
-        "rev": "8264b886c1e64bffc172c49e9dfcb551cbd863f4",
+        "rev": "61d68e21e3fbc2d57590051f48736bea271f4aba",
         "type": "github"
       },
       "original": {
-        "owner": "Henry-Hiles",
-        "ref": "quad/fix/names",
+        "owner": "neobrain",
         "repo": "nix2flatpak",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 2f55b83..c1502f0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,7 +5,7 @@
     self.submodules = true;
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     flake-parts.url = "github:hercules-ci/flake-parts";
-    nix2flatpak.url = "github:Henry-Hiles/nix2flatpak/quad/fix/names";
+    nix2flatpak.url = "github:neobrain/nix2flatpak";
   };
 
   outputs =
diff --git a/lib/controllers/unified_push.dart b/lib/controllers/unified_push.dart
index f637156..47354ad 100644
--- a/lib/controllers/unified_push.dart
+++ b/lib/controllers/unified_push.dart
@@ -103,7 +103,7 @@ class UnifiedPushController extends AsyncNotifier<bool> {
         await ref
             .watch(PushKeyController.provider(instance).notifier)
             .set(null);
-        ref.invalidateSelf();
+        state = .data(false);
       },
     );
 
@@ -139,7 +139,7 @@ class UnifiedPushController extends AsyncNotifier<bool> {
       vapid: capabilities.webpush?.vapid,
     );
 
-    if (!alreadyRegistered) ref.invalidateSelf();
+    state = .data(true);
   }
 
   Future<void> deregister() async {
@@ -157,7 +157,7 @@ class UnifiedPushController extends AsyncNotifier<bool> {
     }
 
     await UnifiedPush.unregister(clientState.deviceId!);
-    ref.invalidateSelf();
+    state = .data(false);
   }
 
   static final provider = AsyncNotifierProvider<UnifiedPushController, bool>(