diff --git a/share/functions/__fish_config_interactive.fish b/share/functions/__fish_config_interactive.fish
index 43b369518..630450c5c 100644
--- a/share/functions/__fish_config_interactive.fish
+++ b/share/functions/__fish_config_interactive.fish
@@ -110,13 +110,15 @@ function __fish_config_interactive -d "Initializations that should be performed
     # Print a greeting.
     # fish_greeting can be a function (preferred) or a variable.
     #
-    if functions -q fish_greeting
-        fish_greeting
-    else
-        # The greeting used to be skipped when fish_greeting was empty (not just undefined)
-        # Keep it that way to not print superfluous newlines on old configuration
-        test -n "$fish_greeting"
-        and echo $fish_greeting
+    if status --is-interactive
+        if functions -q fish_greeting
+            fish_greeting
+        else
+            # The greeting used to be skipped when fish_greeting was empty (not just undefined)
+            # Keep it that way to not print superfluous newlines on old configuration
+            test -n "$fish_greeting"
+            and echo $fish_greeting
+        end
     end
 
     #