diff --git a/fish_greeting.fish b/fish_greeting.fish
index 3b1ad83..c74f50d 100644
--- a/fish_greeting.fish
+++ b/fish_greeting.fish
@@ -1,6 +1,10 @@
 function fish_greeting -d "What's up, fish?"
     set_color $fish_color_autosuggestion
     uname -nmsr
-    command -q -s uptime; and uptime
+
+    # TODO: `command -q -s` only works on fish 2.5+, so hold off on that for now
+    command -s uptime >/dev/null
+    and uptime
+
     set_color normal
 end