diff --git a/quickfixj-core/src/main/java/quickfix/JdbcLog.java b/quickfixj-core/src/main/java/quickfix/JdbcLog.java
index 8ccf5cdb0..308e37fad 100644
--- a/quickfixj-core/src/main/java/quickfix/JdbcLog.java
+++ b/quickfixj-core/src/main/java/quickfix/JdbcLog.java
@@ -61,22 +61,23 @@ public JdbcLog(SessionSettings settings, SessionID sessionID, DataSource ds)
                 ? JdbcUtil.getDataSource(settings, sessionID)
                 : ds;
 
-        logHeartbeats = !settings.isSetting(SETTING_JDBC_LOG_HEARTBEATS) || settings.getBool(SETTING_JDBC_LOG_HEARTBEATS);
+        logHeartbeats = !settings.isSetting(sessionID, SETTING_JDBC_LOG_HEARTBEATS)
+                || settings.getBool(sessionID, SETTING_JDBC_LOG_HEARTBEATS);
         setLogHeartbeats(logHeartbeats);
 
-        if (settings.isSetting(SETTING_LOG_OUTGOING_TABLE)) {
+        if (settings.isSetting(sessionID, SETTING_LOG_OUTGOING_TABLE)) {
             outgoingMessagesTableName = settings.getString(sessionID, SETTING_LOG_OUTGOING_TABLE);
         } else {
             outgoingMessagesTableName = DEFAULT_MESSAGES_LOG_TABLE;
         }
 
-        if (settings.isSetting(SETTING_LOG_INCOMING_TABLE)) {
+        if (settings.isSetting(sessionID, SETTING_LOG_INCOMING_TABLE)) {
             incomingMessagesTableName = settings.getString(sessionID, SETTING_LOG_INCOMING_TABLE);
         } else {
             incomingMessagesTableName = DEFAULT_MESSAGES_LOG_TABLE;
         }
 
-        if (settings.isSetting(SETTING_LOG_EVENT_TABLE)) {
+        if (settings.isSetting(sessionID, SETTING_LOG_EVENT_TABLE)) {
             eventTableName = settings.getString(sessionID, SETTING_LOG_EVENT_TABLE);
         } else {
             eventTableName = DEFAULT_EVENT_LOG_TABLE;