diff --git a/appvm-scripts/etc/profile.d/qubes-gui.csh b/appvm-scripts/etc/profile.d/qubes-gui.csh
index 8cb5573a..750b9a5a 100644
--- a/appvm-scripts/etc/profile.d/qubes-gui.csh
+++ b/appvm-scripts/etc/profile.d/qubes-gui.csh
@@ -1,5 +1,7 @@
-setenv DISPLAY ":0"
-setenv _JAVA_AWT_WM_NONREPARENTING "1"
+if (! ($?SSH_CLIENT || $SSH_TTY)) ; then
+  setenv DISPLAY ":0"
+  setenv _JAVA_AWT_WM_NONREPARENTING "1"
+endif
 if ( -f /var/run/qubes-service/software-rendering )
   setenv GSK_RENDERER "cairo"
   setenv GDK_DEBUG "gl-disable vulkan-disable"
diff --git a/appvm-scripts/etc/profile.d/qubes-gui.sh b/appvm-scripts/etc/profile.d/qubes-gui.sh
index 522fe588..72b1c55c 100644
--- a/appvm-scripts/etc/profile.d/qubes-gui.sh
+++ b/appvm-scripts/etc/profile.d/qubes-gui.sh
@@ -1,4 +1,6 @@
-export DISPLAY=:0 _JAVA_AWT_WM_NONREPARENTING=1
+if ! ([ -n "$SSH_CLIENT" ] || [ -n "$SSH_TTY" ] ]); then
+  export DISPLAY=:0 _JAVA_AWT_WM_NONREPARENTING=1
+fi
 if test -f /var/run/qubes-service/software-rendering; then
   export GSK_RENDERER="cairo" GDK_DEBUG="gl-disable vulkan-disable" \
          LIBGL_ALWAYS_SOFTWARE=1