diff --git a/share/functions/fish_jj_prompt.fish b/share/functions/fish_jj_prompt.fish
index e3b8eaf17..288f4f753 100644
--- a/share/functions/fish_jj_prompt.fish
+++ b/share/functions/fish_jj_prompt.fish
@@ -1,4 +1,9 @@
 function fish_jj_prompt
+    # If jj isn't installed, there's nothing we can do
+    # Return 1 so the calling prompt can deal with it
+    if not command -sq jj
+        return 1
+    end
     jj log 2>/dev/null --no-graph --ignore-working-copy --color=always --revisions @ \
         --template '
             concat(