diff --git a/kernel/core/tos_sem.c b/kernel/core/tos_sem.c
index 40ca0bde..650951ad 100644
--- a/kernel/core/tos_sem.c
+++ b/kernel/core/tos_sem.c
@@ -25,6 +25,12 @@ __API__ k_err_t tos_sem_create_max(k_sem_t *sem, k_sem_cnt_t init_count, k_sem_c
 
     sem->count      = init_count;
     sem->count_max  = max_count;
+    
+    if(sem->count > sem->count_max)
+    {
+        sem->count_max = sem->count;
+    }
+    
     pend_object_init(&sem->pend_obj);
     TOS_OBJ_INIT(sem, KNL_OBJ_TYPE_SEMAPHORE);