diff --git a/share/functions/prompt_hostname.fish b/share/functions/prompt_hostname.fish
index 4a068d1d5..225f437c7 100644
--- a/share/functions/prompt_hostname.fish
+++ b/share/functions/prompt_hostname.fish
@@ -1,3 +1,4 @@
 function prompt_hostname
-    echo $hostname;
+    # return the short hostname only by default (#4804)
+    string replace -r "\..*" "" $hostname
 end