diff --git a/openair-cn/UDP/udp_eNB_task.c b/openair-cn/UDP/udp_eNB_task.c
index d14ef294ad39d515adc68d27bfc893606bd65993..8d3c5dd2f8165f18a1d09bec829bc54b427d2e49 100644
--- a/openair-cn/UDP/udp_eNB_task.c
+++ b/openair-cn/UDP/udp_eNB_task.c
@@ -112,11 +112,15 @@ struct udp_socket_desc_s *udp_eNB_get_socket_desc(task_id_t task_id)
 {
     struct udp_socket_desc_s *udp_sock_p = NULL;
 
-    LOG_I(UDP_, "Looking for task %d\n", task_id);
+#if defined(LOG_UDP) && LOG_UDP > 0
+    LOG_T(UDP_, "Looking for task %d\n", task_id);
+#endif
 
     STAILQ_FOREACH(udp_sock_p, &udp_socket_list, entries) {
         if (udp_sock_p->task_id == task_id) {
-            LOG_I(UDP_, "Found matching task desc\n");
+#if defined(LOG_UDP) && LOG_UDP > 0
+            LOG_T(UDP_, "Found matching task desc\n");
+#endif
             break;
         }
     }
@@ -135,7 +139,9 @@ void udp_eNB_process_file_descriptors(struct epoll_event *events, int nb_events)
     for (i = 0; i < nb_events; i++) {
         STAILQ_FOREACH(udp_sock_p, &udp_socket_list, entries) {
             if (udp_sock_p->sd == events[i].data.fd) {
+#if defined(LOG_UDP) && LOG_UDP > 0
                 LOG_D(UDP_, "Found matching task desc\n");
+#endif
                 udp_eNB_receiver(udp_sock_p);
                 break;
             }
@@ -220,9 +226,11 @@ udp_eNB_send_to(
               sd, IPV4_ADDR_FORMAT(address), port, length);
         return -1;
     }
+#if defined(LOG_UDP) && LOG_UDP > 0
     LOG_I(UDP_, "[SD %d] Successfully sent to "IPV4_ADDR
           " on port %d, buffer size %u, buffer address %x\n",
           sd, IPV4_ADDR_FORMAT(address), port, length, buffer);
+#endif
     return 0;
 }
 
@@ -259,8 +267,10 @@ void udp_eNB_receiver(struct udp_socket_desc_s *udp_sock_pP)
             udp_data_ind_p->peer_port     = htons(addr.sin_port);
             udp_data_ind_p->peer_address  = addr.sin_addr.s_addr;
 
+#if defined(LOG_UDP) && LOG_UDP > 0
             LOG_I(UDP_, "Msg of length %d received from %s:%u\n",
                       n, inet_ntoa(addr.sin_addr), ntohs(addr.sin_port));
+#endif
             if (itti_send_msg_to_task(udp_sock_pP->task_id, INSTANCE_DEFAULT, message_p) < 0) {
                 LOG_I(UDP_, "Failed to send message %d to task %d\n",
                           UDP_DATA_IND,
@@ -291,7 +301,9 @@ void *udp_eNB_task(void *args_p)
     while(1) {
         itti_receive_msg(TASK_UDP, &received_message_p);
         vcd_signal_dumper_dump_function_by_name(VCD_SIGNAL_DUMPER_FUNCTIONS_UDP_ENB_TASK, VCD_FUNCTION_IN);
+#if defined(LOG_UDP) && LOG_UDP > 0
         LOG_D(UDP_, "Got message %p\n", &received_message_p);
+#endif
         if (received_message_p != NULL) {
 
             msg_name = ITTI_MSG_NAME (received_message_p);
@@ -310,7 +322,9 @@ void *udp_eNB_task(void *args_p)
                 } break;
 
                 case UDP_DATA_REQ: {
-                	LOG_D(UDP_, "Received UDP_DATA_REQ\n");
+#if defined(LOG_UDP) && LOG_UDP > 0
+                    LOG_D(UDP_, "Received UDP_DATA_REQ\n");
+#endif
                     int     udp_sd = -1;
                     ssize_t bytes_written;
 
@@ -343,12 +357,13 @@ void *udp_eNB_task(void *args_p)
                     udp_sd = udp_sock_p->sd;
                     pthread_mutex_unlock(&udp_socket_list_mutex);
 
+#if defined(LOG_UDP) && LOG_UDP > 0
                     LOG_D(UDP_, "[%d] Sending message of size %u to "IPV4_ADDR" and port %u\n",
                             udp_sd,
                             udp_data_req_p->buffer_length,
                           IPV4_ADDR_FORMAT(udp_data_req_p->peer_address),
                           udp_data_req_p->peer_port);
-
+#endif
                     bytes_written = sendto(
                         udp_sd,
                         &udp_data_req_p->buffer[udp_data_req_p->buffer_offset],
@@ -385,7 +400,9 @@ on_error:
         nb_events = itti_get_events(TASK_UDP, &events);
         /* Now handle notifications for other sockets */
         if (nb_events > 0) {
-        	LOG_D(UDP_, "UDP task Process %d events\n",nb_events);
+#if defined(LOG_UDP) && LOG_UDP > 0
+            LOG_D(UDP_, "UDP task Process %d events\n",nb_events);
+#endif
             udp_eNB_process_file_descriptors(events, nb_events);
         }
         vcd_signal_dumper_dump_function_by_name(VCD_SIGNAL_DUMPER_FUNCTIONS_UDP_ENB_TASK, VCD_FUNCTION_OUT);