diff --git a/net/at/include/tos_at.h b/net/at/include/tos_at.h
index d9ad252a..aa9a0b12 100644
--- a/net/at/include/tos_at.h
+++ b/net/at/include/tos_at.h
@@ -78,6 +78,8 @@ typedef struct at_data_channel_st {
 
     at_channel_status_t status;
 
+    k_stopwatch_t       timer;
+
     const char         *remote_ip;
     const char         *remote_port;
 } at_data_channel_t;
@@ -113,8 +115,6 @@ typedef struct at_agent_st {
     k_task_t        parser;
     at_cache_t      recv_cache;
 
-    k_stopwatch_t   timer;
-
     k_mutex_t       global_lock;
 
     char           *cmd_buf;
diff --git a/net/at/src/tos_at.c b/net/at/src/tos_at.c
index 8a9bf496..47b8bd5f 100644
--- a/net/at/src/tos_at.c
+++ b/net/at/src/tos_at.c
@@ -634,9 +634,9 @@ __API__ int tos_at_channel_read_timed(int channel_id, uint8_t *buffer, size_t bu
 
     tick = tos_millisec2tick(timeout);
 
-    tos_stopwatch_countdown(&AT_AGENT->timer, tick);
-    while (!tos_stopwatch_is_expired(&AT_AGENT->timer)) {
-        remain_tick = tos_stopwatch_remain(&AT_AGENT->timer);
+    tos_stopwatch_countdown(&data_channel->timer, tick);
+    while (!tos_stopwatch_is_expired(&data_channel->timer)) {
+        remain_tick = tos_stopwatch_remain(&data_channel->timer);
         if (remain_tick == (k_tick_t)0u) {
             return total_read_len;
         }
@@ -694,6 +694,10 @@ __STATIC_INLINE__ int at_channel_construct(at_data_channel_t *data_channel, cons
         goto errout;
     }
 
+    if (tos_stopwatch_create(&data_channel->timer) != K_ERR_NONE) {
+        goto errout;
+    }
+
     data_channel->rx_fifo_buffer = fifo_buffer;
     tos_chr_fifo_create(&data_channel->rx_fifo, fifo_buffer, AT_DATA_CHANNEL_FIFO_BUFFER_SIZE);
     data_channel->remote_ip = ip;
@@ -759,6 +763,8 @@ __API__ int tos_at_channel_free(int channel_id)
 
     tos_mutex_destroy(&data_channel->rx_lock);
 
+    tos_stopwatch_destroy(&data_channel->timer);
+
     tos_mmheap_free(data_channel->rx_fifo_buffer);
     tos_chr_fifo_destroy(&data_channel->rx_fifo);
 
@@ -851,8 +857,6 @@ __API__ int tos_at_init(hal_uart_port_t uart_port, at_event_t *event_table, size
 
     at_channel_init();
 
-    tos_stopwatch_create(&AT_AGENT->timer);
-
     buffer = tos_mmheap_alloc(AT_UART_RX_FIFO_BUFFER_SIZE);
     if (!buffer) {
         return -1;
@@ -960,8 +964,6 @@ __API__ void tos_at_deinit(void)
 
     tos_chr_fifo_destroy(&AT_AGENT->uart_rx_fifo);
 
-    tos_stopwatch_destroy(&AT_AGENT->timer);
-
     at_channel_deinit();
 }