From 11fde4d3a0134c9831d88d04f9e9215750009602 Mon Sep 17 00:00:00 2001
From: Tobias Ahrens <tobias.ahrens@zhinst.com>
Date: Thu, 14 Nov 2024 09:20:54 +0100
Subject: [PATCH] Fix issue that prevents connecting to different data server
 on the same host

---
 CHANGELOG.md                 | 3 +++
 src/zhinst/qcodes/session.py | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f9dec35..88e399f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # zhinst-qcodes Changelog
 
+## Version 0.5.4
+* Fix issue that prevented connecting to different data server on the same host.
+
 ## Version 0.5.4
 * Fix issue that cause node names to collide with native attributes. (`/zi/debug/log` 
   collided with the native log attribute on Nodes)
diff --git a/src/zhinst/qcodes/session.py b/src/zhinst/qcodes/session.py
index c4af7eb..9ee68c0 100644
--- a/src/zhinst/qcodes/session.py
+++ b/src/zhinst/qcodes/session.py
@@ -507,7 +507,7 @@ def __new__(
         if not new_session:
             for instance in Session.instances():
                 if instance.server_host == server_host and (
-                    instance.is_hf2_server == hf2
+                    (instance.is_hf2_server and hf2)
                     or server_port is None
                     or instance.server_port == server_port
                 ):