diff --git a/armsrc/spiffs_hydrogen.c b/armsrc/spiffs_hydrogen.c
index dee72fb5f..7290e676a 100644
--- a/armsrc/spiffs_hydrogen.c
+++ b/armsrc/spiffs_hydrogen.c
@@ -749,7 +749,7 @@ static s32_t spiffs_stat_pix(spiffs *fs, spiffs_page_ix pix, spiffs_file fh, spi
     s->type = objix_hdr.type;
     s->size = objix_hdr.size == SPIFFS_UNDEFINED_LEN ? 0 : objix_hdr.size;
     s->pix = pix;
-    strncpy((char *)s->name, (char *)objix_hdr.name, SPIFFS_OBJ_NAME_LEN);
+    strncpy((char *)s->name, (char *)objix_hdr.name, SPIFFS_OBJ_NAME_LEN - 1);
 #if SPIFFS_OBJ_META_LEN
     _SPIFFS_MEMCPY(s->meta, objix_hdr.meta, SPIFFS_OBJ_META_LEN);
 #endif
diff --git a/armsrc/spiffs_nucleus.c b/armsrc/spiffs_nucleus.c
index 8dd4b5629..ef1db36f1 100644
--- a/armsrc/spiffs_nucleus.c
+++ b/armsrc/spiffs_nucleus.c
@@ -944,7 +944,7 @@ s32_t spiffs_object_create(
     oix_hdr.p_hdr.flags = 0xff & ~(SPIFFS_PH_FLAG_FINAL | SPIFFS_PH_FLAG_INDEX | SPIFFS_PH_FLAG_USED);
     oix_hdr.type = type;
     oix_hdr.size = SPIFFS_UNDEFINED_LEN; // keep ones so we can update later without wasting this page
-    strncpy((char *)oix_hdr.name, (const char *)name, SPIFFS_OBJ_NAME_LEN);
+    strncpy((char *)oix_hdr.name, (const char *)name, SPIFFS_OBJ_NAME_LEN - 1);
 #if SPIFFS_OBJ_META_LEN
     if (meta) {
         _SPIFFS_MEMCPY(oix_hdr.meta, meta, SPIFFS_OBJ_META_LEN);
@@ -1007,7 +1007,7 @@ s32_t spiffs_object_update_index_hdr(
 
     // change name
     if (name) {
-        strncpy((char *)objix_hdr->name, (const char *)name, SPIFFS_OBJ_NAME_LEN);
+        strncpy((char *)objix_hdr->name, (const char *)name, SPIFFS_OBJ_NAME_LEN - 1);
     }
 #if SPIFFS_OBJ_META_LEN
     if (meta) {