diff --git a/profile/flatpak.sh.in b/profile/flatpak.sh.in
index 34a21b3f..74e62f6a 100644
--- a/profile/flatpak.sh.in
+++ b/profile/flatpak.sh.in
@@ -1,4 +1,11 @@
 # @sysconfdir@/profile.d/flatpak.sh - set XDG_DATA_DIRS
 
-XDG_DATA_DIRS="${XDG_DATA_DIRS:-$HOME/.local/share/flatpak/exports/share:@localstatedir@/lib/flatpak/exports/share/:/usr/local/share/:/usr/share/}"
+flatpak_dirs=$HOME/.local/share/flatpak/exports/share/:@localstatedir@/lib/flatpak/exports/share/
+
+if [ -z "${XDG_DATA_DIRS}" ]; then
+    XDG_DATA_DIRS="$flatpak_dirs:/usr/local/share/:/usr/share/"
+else
+    XDG_DATA_DIRS="$XDG_DATA_DIRS:$flatpak_dirs"
+fi
+
 export XDG_DATA_DIRS