diff --git a/modules/services/lorri.nix b/modules/services/lorri.nix
index 84b6d04c0..39b53c4dd 100644
--- a/modules/services/lorri.nix
+++ b/modules/services/lorri.nix
@@ -100,6 +100,12 @@ in
         };
 
         Service = {
+          # Don't start until lorri daemon is actually running
+          ExecStartPre = pkgs.writeShellScript "lorri-notify-check" ''
+            lorri info --shell-file . | grep 'Lorri Daemon Status:.*running'
+          '';
+          RestartSec = "5s";
+
           ExecStart =
             let
               jqFile = ''
@@ -129,6 +135,7 @@ in
                 with pkgs;
                 [
                   bash
+                  gnugrep
                   jq
                   libnotify
                   cfg.package