diff --git a/executables/nr-softmodem.c b/executables/nr-softmodem.c
index 632e2d8d30d84027ffa6725d71bc42cea04e5023..4727d09b043290dcc4f66a98f14fe1caefef8e4f 100644
--- a/executables/nr-softmodem.c
+++ b/executables/nr-softmodem.c
@@ -370,10 +370,10 @@ int create_gNB_tasks(uint32_t gnb_nb) {
         }
       }
 
-      if (itti_create_task (TASK_GTPV1_U, &nr_gtpv1u_gNB_task, NULL) < 0) {
+      /*if (itti_create_task (TASK_GTPV1_U, &nr_gtpv1u_gNB_task, NULL) < 0) {
         LOG_E(GTPU, "Create task for GTPV1U failed\n");
         return -1;
-      }
+      }*/
     }
   }
 
@@ -388,9 +388,12 @@ int create_gNB_tasks(uint32_t gnb_nb) {
       LOG_E(NR_RRC, "Create task for NR RRC gNB failed\n");
       return -1;
     }
-    if (itti_create_task (TASK_GTPV1_U, &nr_gtpv1u_gNB_task, NULL) < 0) {
-      LOG_E(GTPU, "Create task for GTPV1U failed\n");
-      return -1;
+    //Use check on x2ap to consider the NSA scenario and check on AMF_MODE_ENABLED for the SA scenario 
+    if(is_x2ap_enabled() || AMF_MODE_ENABLED){
+      if (itti_create_task (TASK_GTPV1_U, &nr_gtpv1u_gNB_task, NULL) < 0) {
+        LOG_E(GTPU, "Create task for GTPV1U failed\n");
+        return -1;
+      }
     }
   }