diff --git a/build/entrypoint.sh b/build/entrypoint.sh
index cc1b9f7..bfd36f5 100644
--- a/build/entrypoint.sh
+++ b/build/entrypoint.sh
@@ -19,8 +19,7 @@ if [[ $1 == init ]]; then
     /protonmail/proton-bridge --cli $@
 
 else
-    export $(dbus-launch --sh-syntax --exit-with-session)
-    dbus-daemon --session --fork --print-address  # keep it alive
+    eval "$(dbus-launch --sh-syntax --exit-with-session)"
 
     # socat will make the conn appear to come from 127.0.0.1
     # ProtonMail Bridge currently expects that.