diff --git a/x2goserver-xsession/etc/Xsession b/x2goserver-xsession/etc/Xsession
index 270a0b30..e4c1f880 100755
--- a/x2goserver-xsession/etc/Xsession
+++ b/x2goserver-xsession/etc/Xsession
@@ -59,7 +59,7 @@ for file in "/etc/profile" "$HOME/.profile" "/etc/xprofile" "$HOME/.xprofile"; d
 	fi
 done
 
-cur_hostname="$(hostname)"
+cur_hostname="$(uname -n)"
 if [ -z "${cur_hostname}" ] || [ "${cur_hostname}" = "(none)" ] || [ "${cur_hostname}" = "localhost" ]; then
 	errormsg "Hostname not set correctly; aborting."
 fi
diff --git a/x2goserver/bin/x2goresume-session b/x2goserver/bin/x2goresume-session
index 6de83c8a..864ad441 100755
--- a/x2goserver/bin/x2goresume-session
+++ b/x2goserver/bin/x2goresume-session
@@ -55,10 +55,10 @@ typeset fullscreen_val='0'
 #   - even if the above is not the case, we want to be sure to get the actual
 #     system host name.
 #
-# Workaround: use hostname.
+# Workaround: use uname -n.
 typeset current_host_name=''
 
-if ! current_host_name="$(hostname)"; then
+if ! current_host_name="$(uname -n)"; then
 	msg="Unable to retrieve machine's hostname. This is required. Aborting session startup."
 	"${x2go_lib_path}/x2gosyslog" "${0}" 'err' "${msg}"
 
diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent
index ee63ac18..798a7e3c 100755
--- a/x2goserver/bin/x2gostartagent
+++ b/x2goserver/bin/x2gostartagent
@@ -67,10 +67,10 @@ fi
 #   - even if the above is not the case, we want to be sure to get the actual
 #     system host name.
 #
-# Workaround: use hostname.
+# Workaround: use uname -n.
 typeset current_host_name=''
 
-if ! current_host_name="$(hostname)"; then
+if ! current_host_name="$(uname -n)"; then
 	typeset msg='Unable to retrieve machine'"'"'s hostname. This is required. Aborting session startup.'
 	"${X2GO_LIB_PATH}/x2gosyslog" "${0}" 'err' "${msg}"