diff --git a/bus/main.c b/bus/main.c
index 50f47dc3..8f238968 100644
--- a/bus/main.c
+++ b/bus/main.c
@@ -298,7 +298,6 @@ main (int argc, char **argv)
         }
       else if (strcmp (arg, "--session") == 0)
         {
-          is_session_bus = TRUE;
           check_two_config_files (&config_file, "session");
 
           if (!_dbus_append_session_config_file (&config_file))
@@ -455,6 +454,9 @@ main (int argc, char **argv)
       exit (1);
     }
 
+  is_session_bus = bus_context_get_type(context) != NULL
+      && strcmp(bus_context_get_type(context),"session") == 0;
+
   if (is_session_bus)
     _dbus_daemon_publish_session_bus_address (bus_context_get_address (context));