diff --git a/.config/shell/shrc b/.config/shell/shrc
index c70d43b..d027687 100644
--- a/.config/shell/shrc
+++ b/.config/shell/shrc
@@ -38,11 +38,6 @@ error() {
 # change cursor to a beam by default
 printf '\e[5 q'
 
-# Warn if profile isn't loaded, if not in an ssh connection
-if ! "${PROFILE_LOADED:-false}" || [ -z "${SSH_TTY:+foo}" ]; then
-   echo "Warning: profile was not loaded! Set PROFILE_LOADED to 'true' to disable this warning." >&2
-fi
-
 ### <<<
 ### Generic shell configuration >>>
 ### Environment variables >>>
diff --git a/.profile b/.profile
index 08dbddd..3040dfd 100644
--- a/.profile
+++ b/.profile
@@ -50,7 +50,7 @@ export LESS_TERMCAP_ue="$(printf '%b' '[0m')"
 export MOZ_USE_XINPUT2="1"    # Mozilla smooth scrolling/touchpads.
 export VDPAU_DRIVER=va_gl     # Fix steam remote play black screen
 # shellcheck disable=SC2046
-export $(dbus-launch)
+command -v dbus-launch && export $(dbus-launch)