diff --git a/packages/c/cmake/atsdk.cmake b/packages/c/cmake/atsdk.cmake
index 7d987ed46..24766f0b0 100644
--- a/packages/c/cmake/atsdk.cmake
+++ b/packages/c/cmake/atsdk.cmake
@@ -3,7 +3,7 @@ if(NOT atsdk_FOUND)
   FetchContent_Declare(
     atsdk
     GIT_REPOSITORY https://github.com/atsign-foundation/at_c.git
-    GIT_TAG 6650e33ab80e9d873ede6d0213fa2999054fce7b
+    GIT_TAG 9b9cb315a8af08a19e9679c9dad98572536f2ee4
   )
   FetchContent_MakeAvailable(atsdk)
   install(TARGETS atclient atchops atlogger)
diff --git a/packages/c/sshnpd/CHANGELOG.md b/packages/c/sshnpd/CHANGELOG.md
index e846d253f..6ef901fcf 100644
--- a/packages/c/sshnpd/CHANGELOG.md
+++ b/packages/c/sshnpd/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.2.5
+
+- fix: uptake some fixes in monitor
+
 ## 0.2.4
 
 - fix: Disabled clang-tidy missing-includes, as it malformed header includes
diff --git a/packages/c/sshnpd/include/sshnpd/version.h b/packages/c/sshnpd/include/sshnpd/version.h
index 31e3eb40d..58a83c2d6 100644
--- a/packages/c/sshnpd/include/sshnpd/version.h
+++ b/packages/c/sshnpd/include/sshnpd/version.h
@@ -1,4 +1,4 @@
 #ifndef SSHNPD_VERSION_H
 #define SSHNPD_VERSION_H
-#define SSHNPD_VERSION "0.2.4"
+#define SSHNPD_VERSION "0.2.5"
 #endif
diff --git a/packages/c/sshnpd/src/main.c b/packages/c/sshnpd/src/main.c
index 93f6a6ca0..ba68bc238 100644
--- a/packages/c/sshnpd/src/main.c
+++ b/packages/c/sshnpd/src/main.c
@@ -415,12 +415,16 @@ void main_loop() {
     // Read the next monitor message
     int ret = atclient_monitor_read(&monitor_ctx, &worker, &message, &monitor_hooks);
     if (ret != 0) {
-      atlogger_log(LOGGER_TAG, ATLOGGER_LOGGING_LEVEL_ERROR, "Possible bad state: monitor read failed\n");
+      atlogger_log(LOGGER_TAG, ATLOGGER_LOGGING_LEVEL_ERROR, "Possible bad state: monitor read failed (ret: %d)\n",
+                   ret);
     }
 
     atlogger_log(LOGGER_TAG, ATLOGGER_LOGGING_LEVEL_DEBUG, "Received message of type: %d\n", message.type);
 
     switch (message.type) {
+    case ATCLIENT_MONITOR_MESSAGE_TYPE_EMPTY:
+      // We got a timeout, nothing to read, nothing to do
+      break;
     case ATCLIENT_MONITOR_ERROR_READ:
       if (!atclient_monitor_is_connected(&monitor_ctx)) {
         atlogger_log(LOGGER_TAG, ATLOGGER_LOGGING_LEVEL_ERROR,