diff --git a/executables/nr-softmodem.c b/executables/nr-softmodem.c
index b855418d649674b6337ede00b9c1a123c629d282..1b33667b1396811eaeaf23e3c68fa8bb40039bcf 100644
--- a/executables/nr-softmodem.c
+++ b/executables/nr-softmodem.c
@@ -823,7 +823,8 @@ int main( int argc, char **argv ) {
   }
 
   printf("About to call end_configmodule() from %s() %s:%d\n", __FUNCTION__, __FILE__, __LINE__);
-  end_configmodule();
+  // We have to set PARAMFLAG_NOFREE on right paramters before re-enabling end_configmodule()
+  //end_configmodule();
   printf("Called end_configmodule() from %s() %s:%d\n", __FUNCTION__, __FILE__, __LINE__);
   // wait for end of program
   printf("TYPE <CTRL-C> TO TERMINATE\n");
diff --git a/targets/RT/USER/lte-uesoftmodem.c b/targets/RT/USER/lte-uesoftmodem.c
index 026e6d4a6061afc262b2a9f31d9c45c0ce371902..25bbef0bc6a1b37294c19ada7ad263ee0639db6f 100644
--- a/targets/RT/USER/lte-uesoftmodem.c
+++ b/targets/RT/USER/lte-uesoftmodem.c
@@ -757,6 +757,7 @@ int main( int argc, char **argv ) {
   printf("sync sent\n");
   /*
     printf("About to call end_configmodule() from %s() %s:%d\n", __FUNCTION__, __FILE__, __LINE__);
+    We have to set properly PARAMFLAG_NOFREE
     end_configmodule();
     printf("Called end_configmodule() from %s() %s:%d\n", __FUNCTION__, __FILE__, __LINE__);
   */