diff --git a/openair-cn/NAS/EURECOM-NAS/src/util/nas_timer.c b/openair-cn/NAS/EURECOM-NAS/src/util/nas_timer.c
index 2f04c86e5ec0ee37bdda6da4cd780a55841b8c64..389822ac6d841242eb84dffc31ca6354859f8005 100644
--- a/openair-cn/NAS/EURECOM-NAS/src/util/nas_timer.c
+++ b/openair-cn/NAS/EURECOM-NAS/src/util/nas_timer.c
@@ -283,8 +283,14 @@ int nas_timer_stop(int id)
 {
     /* Check if the timer entry is active */
     if (_nas_timer_db_is_active(id)) {
+        nas_timer_entry_t *entry;
         /* Remove the entry from the timer queue */
-        (void) _nas_timer_db_remove_entry(id);
+        entry = _nas_timer_db_remove_entry(id);
+#if defined(ENABLE_ITTI)
+        timer_remove(entry->timer_id);
+#else
+        (void)entry;
+#endif
         /* Delete the timer entry */
         _nas_timer_db_delete_entry(id);
         return (NAS_TIMER_INACTIVE_ID);