diff --git a/cmake/Depthai/DepthaiDeviceRVC4Config.cmake b/cmake/Depthai/DepthaiDeviceRVC4Config.cmake
index 2e6eb9dc0..63eb05ab1 100644
--- a/cmake/Depthai/DepthaiDeviceRVC4Config.cmake
+++ b/cmake/Depthai/DepthaiDeviceRVC4Config.cmake
@@ -4,4 +4,4 @@ set(DEPTHAI_DEVICE_RVC4_MATURITY "snapshot")
 
 # "version if applicable"
 # set(DEPTHAI_DEVICE_RVC4_VERSION "0.0.1+93f7b75a885aa32f44c5e9f53b74470c49d2b1af")
-set(DEPTHAI_DEVICE_RVC4_VERSION "0.0.1+4fec8fce82ca671df0ba4446c084e626bd53b73a")
+set(DEPTHAI_DEVICE_RVC4_VERSION "0.0.1+14625de3283a5423280b17a644aab94ecdf66539")
diff --git a/cmake/depthaiDependencies.cmake b/cmake/depthaiDependencies.cmake
index a74cb57cc..8693aeb7a 100644
--- a/cmake/depthaiDependencies.cmake
+++ b/cmake/depthaiDependencies.cmake
@@ -177,7 +177,7 @@ else()
     FetchContent_Declare(
         XLink
         GIT_REPOSITORY https://github.com/luxonis/XLink.git
-        GIT_TAG        13790284ce12969c169940f88aad755bd91146db
+        GIT_TAG        fcc46245f61d99c4dcd8c33756e0fe19ede8f230
     )
 
     FetchContent_MakeAvailable(
diff --git a/src/device/DeviceGate.cpp b/src/device/DeviceGate.cpp
index 7698736e5..8492bc301 100644
--- a/src/device/DeviceGate.cpp
+++ b/src/device/DeviceGate.cpp
@@ -52,8 +52,12 @@ DeviceGate::DeviceGate(const DeviceInfo& deviceInfo) : deviceInfo(deviceInfo) {
     } else {
         throw std::runtime_error("Unknown platform");  // Should never happen
     }
+    auto gateHost = deviceInfo.name;
+    if (deviceInfo.protocol == X_LINK_LOCAL_SHDMEM) {
+        gateHost = "127.0.0.1";
+    }
     // Discover and connect
-    pimpl->cli = std::make_unique<httplib::Client>(deviceInfo.name, DEFAULT_PORT);
+    pimpl->cli = std::make_unique<httplib::Client>(gateHost, DEFAULT_PORT);
     pimpl->cli->set_read_timeout(60);  // 60 seconds timeout to allow for compressing the crash dumps without async
     // pimpl->cli->set_connection_timeout(2);
 }