diff --git a/src/borg/cache_sync/unpack.h b/src/borg/cache_sync/unpack.h
index a04e81147..a67207725 100644
--- a/src/borg/cache_sync/unpack.h
+++ b/src/borg/cache_sync/unpack.h
@@ -388,6 +388,11 @@ static inline int unpack_callback_raw(unpack_user* u, const char* b, const char*
             u->expect = expect_map_item_end;
         }
         break;
+    default:
+        if(u->inside_chunks) {
+            SET_LAST_ERROR("Unexpected raw in chunks structure");
+            return -1;
+        }
     }
     return 0;
 }