diff --git a/apps/swayosd/default.nix b/apps/swayosd/default.nix
index 663b85d..eff65ca 100644
--- a/apps/swayosd/default.nix
+++ b/apps/swayosd/default.nix
@@ -1,10 +1,23 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  lib,
+  ...
+}: {
   services.swayosd.enable = true;
 
+  # Auto-restart swayosd on crash
+  systemd.user.services.swayosd = {
+    Unit = {
+      StartLimitBurst = lib.mkForce 5;
+      StartLimitIntervalSec = lib.mkForce 30;
+    };
+    Service = {
+      Restart = lib.mkForce "on-failure";
+      RestartSec = lib.mkForce "100ms";
+    };
+  };
+
   wayland.windowManager.hyprland.settings = {
-    exec-once = [
-      "uwsm app -- swayosd-server"
-    ];
     bindel = [
       ", XF86AudioRaiseVolume, exec, swayosd-client --output-volume raise"
       ", XF86AudioLowerVolume, exec, swayosd-client --output-volume lower"