diff --git a/src/hss/hss-context.c b/src/hss/hss-context.c
index e5cc220849..a938fb2f9f 100644
--- a/src/hss/hss-context.c
+++ b/src/hss/hss-context.c
@@ -134,9 +134,6 @@ int hss_context_parse_config()
                             } else if (!strcmp(fd_key, "sec_port")) {
                                 const char *v = ogs_yaml_iter_value(&fd_iter);
                                 if (v) self.fd_config->cnf_port_tls = atoi(v);
-                            } else if (!strcmp(fd_key, "no_sctp")) {
-                                self.fd_config->cnf_flags.no_sctp =
-                                    ogs_yaml_iter_bool(&fd_iter);
                             } else if (!strcmp(fd_key, "listen_on")) {
                                 self.fd_config->cnf_addr = 
                                     ogs_yaml_iter_value(&fd_iter);
diff --git a/src/mme/mme-context.c b/src/mme/mme-context.c
index aa79fbffa0..89cfba278d 100644
--- a/src/mme/mme-context.c
+++ b/src/mme/mme-context.c
@@ -298,9 +298,6 @@ int mme_context_parse_config()
                             } else if (!strcmp(fd_key, "sec_port")) {
                                 const char *v = ogs_yaml_iter_value(&fd_iter);
                                 if (v) self.fd_config->cnf_port_tls = atoi(v);
-                            } else if (!strcmp(fd_key, "no_sctp")) {
-                                self.fd_config->cnf_flags.no_sctp =
-                                    ogs_yaml_iter_bool(&fd_iter);
                             } else if (!strcmp(fd_key, "listen_on")) {
                                 self.fd_config->cnf_addr = 
                                     ogs_yaml_iter_value(&fd_iter);
diff --git a/src/pcrf/pcrf-context.c b/src/pcrf/pcrf-context.c
index d15adfa52a..e3e919c7e1 100644
--- a/src/pcrf/pcrf-context.c
+++ b/src/pcrf/pcrf-context.c
@@ -141,9 +141,6 @@ int pcrf_context_parse_config()
                             } else if (!strcmp(fd_key, "sec_port")) {
                                 const char *v = ogs_yaml_iter_value(&fd_iter);
                                 if (v) self.fd_config->cnf_port_tls = atoi(v);
-                            } else if (!strcmp(fd_key, "no_sctp")) {
-                                self.fd_config->cnf_flags.no_sctp =
-                                    ogs_yaml_iter_bool(&fd_iter);
                             } else if (!strcmp(fd_key, "listen_on")) {
                                 self.fd_config->cnf_addr = 
                                     ogs_yaml_iter_value(&fd_iter);
diff --git a/src/pgw/pgw-context.c b/src/pgw/pgw-context.c
index afbb93b939..549b407b7e 100644
--- a/src/pgw/pgw-context.c
+++ b/src/pgw/pgw-context.c
@@ -202,9 +202,6 @@ int pgw_context_parse_config()
                             } else if (!strcmp(fd_key, "sec_port")) {
                                 const char *v = ogs_yaml_iter_value(&fd_iter);
                                 if (v) self.fd_config->cnf_port_tls = atoi(v);
-                            } else if (!strcmp(fd_key, "no_sctp")) {
-                                self.fd_config->cnf_flags.no_sctp =
-                                    ogs_yaml_iter_bool(&fd_iter);
                             } else if (!strcmp(fd_key, "listen_on")) {
                                 self.fd_config->cnf_addr = 
                                     ogs_yaml_iter_value(&fd_iter);
diff --git a/support/freeDiameter/hss.conf.in b/support/freeDiameter/hss.conf.in
index ae1713f81e..3658567baf 100644
--- a/support/freeDiameter/hss.conf.in
+++ b/support/freeDiameter/hss.conf.in
@@ -46,12 +46,11 @@ Realm = "localdomain";
 
 # Disable use of TCP protocol (only listen and connect over SCTP)
 # Default : TCP enabled
-No_TCP;
+#No_TCP;
 
 # Disable use of SCTP protocol (only listen and connect over TCP)
 # Default : SCTP enabled
 #No_SCTP;
-#No_SCTP;
 # This option is ignored if freeDiameter is compiled with DISABLE_SCTP option.
 
 # Prefer TCP instead of SCTP for establishing new connections.
diff --git a/support/freeDiameter/mme.conf.in b/support/freeDiameter/mme.conf.in
index bc4e074edc..8cb87072bf 100644
--- a/support/freeDiameter/mme.conf.in
+++ b/support/freeDiameter/mme.conf.in
@@ -46,12 +46,11 @@ Realm = "localdomain";
 
 # Disable use of TCP protocol (only listen and connect over SCTP)
 # Default : TCP enabled
-No_TCP;
+#No_TCP;
 
 # Disable use of SCTP protocol (only listen and connect over TCP)
 # Default : SCTP enabled
 #No_SCTP;
-#No_SCTP;
 # This option is ignored if freeDiameter is compiled with DISABLE_SCTP option.
 
 # Prefer TCP instead of SCTP for establishing new connections.
diff --git a/support/freeDiameter/pcrf.conf.in b/support/freeDiameter/pcrf.conf.in
index be341a56c0..9f4c90f1db 100644
--- a/support/freeDiameter/pcrf.conf.in
+++ b/support/freeDiameter/pcrf.conf.in
@@ -46,12 +46,11 @@ Realm = "localdomain";
 
 # Disable use of TCP protocol (only listen and connect over SCTP)
 # Default : TCP enabled
-No_TCP;
+#No_TCP;
 
 # Disable use of SCTP protocol (only listen and connect over TCP)
 # Default : SCTP enabled
 #No_SCTP;
-#No_SCTP;
 # This option is ignored if freeDiameter is compiled with DISABLE_SCTP option.
 
 # Prefer TCP instead of SCTP for establishing new connections.
diff --git a/support/freeDiameter/pgw.conf.in b/support/freeDiameter/pgw.conf.in
index 52c99ff1fc..1283584c0f 100644
--- a/support/freeDiameter/pgw.conf.in
+++ b/support/freeDiameter/pgw.conf.in
@@ -46,12 +46,11 @@ Realm = "localdomain";
 
 # Disable use of TCP protocol (only listen and connect over SCTP)
 # Default : TCP enabled
-No_TCP;
+#No_TCP;
 
 # Disable use of SCTP protocol (only listen and connect over TCP)
 # Default : SCTP enabled
 #No_SCTP;
-#No_SCTP;
 # This option is ignored if freeDiameter is compiled with DISABLE_SCTP option.
 
 # Prefer TCP instead of SCTP for establishing new connections.
diff --git a/tests/sample-csfb.conf.in b/tests/sample-csfb.conf.in
index b6ac941e63..3b9f1c7edd 100644
--- a/tests/sample-csfb.conf.in
+++ b/tests/sample-csfb.conf.in
@@ -9,7 +9,6 @@ mme:
     freeDiameter:
       identity: mme.localdomain
       realm: localdomain
-      no_sctp: true
       listen_on: 127.0.0.2
       load_extension:
         - module: @abs_top_builddir@/lib/@FREEDIAMETER_DIR@/extensions/dbg_msg_dumps/.libs/dbg_msg_dumps.so
@@ -85,7 +84,6 @@ hss:
     freeDiameter:
       identity: hss.localdomain
       realm: localdomain
-      no_sctp: true
       listen_on: 127.0.0.4
       load_extension:
         - module: @abs_top_builddir@/lib/@FREEDIAMETER_DIR@/extensions/dbg_msg_dumps/.libs/dbg_msg_dumps.so
@@ -111,7 +109,6 @@ pgw:
     freeDiameter:
       identity: pgw.localdomain
       realm: localdomain
-      no_sctp: true
       listen_on: 127.0.0.3
       load_extension:
         - module: @abs_top_builddir@/lib/@FREEDIAMETER_DIR@/extensions/dbg_msg_dumps/.libs/dbg_msg_dumps.so
@@ -145,7 +142,6 @@ pcrf:
     freeDiameter:
       identity: pcrf.localdomain
       realm: localdomain
-      no_sctp: true
       listen_on: 127.0.0.5
       load_extension:
         - module: @abs_top_builddir@/lib/@FREEDIAMETER_DIR@/extensions/dbg_msg_dumps/.libs/dbg_msg_dumps.so
diff --git a/tests/sample-simple.conf.in b/tests/sample-simple.conf.in
index 88394af481..248e9021ea 100644
--- a/tests/sample-simple.conf.in
+++ b/tests/sample-simple.conf.in
@@ -9,7 +9,6 @@ mme:
     freeDiameter:
       identity: mme.localdomain
       realm: localdomain
-      no_sctp: true
       listen_on: 127.0.0.2
       load_extension:
         - module: @abs_top_builddir@/lib/@FREEDIAMETER_DIR@/extensions/dbg_msg_dumps/.libs/dbg_msg_dumps.so
@@ -51,7 +50,6 @@ hss:
     freeDiameter:
       identity: hss.localdomain
       realm: localdomain
-      no_sctp: true
       listen_on: 127.0.0.4
       load_extension:
         - module: @abs_top_builddir@/lib/@FREEDIAMETER_DIR@/extensions/dbg_msg_dumps/.libs/dbg_msg_dumps.so
@@ -77,7 +75,6 @@ pgw:
     freeDiameter:
       identity: pgw.localdomain
       realm: localdomain
-      no_sctp: true
       listen_on: 127.0.0.3
       load_extension:
         - module: @abs_top_builddir@/lib/@FREEDIAMETER_DIR@/extensions/dbg_msg_dumps/.libs/dbg_msg_dumps.so
@@ -114,7 +111,6 @@ pcrf:
     freeDiameter:
       identity: pcrf.localdomain
       realm: localdomain
-      no_sctp: true
       listen_on: 127.0.0.5
       load_extension:
         - module: @abs_top_builddir@/lib/@FREEDIAMETER_DIR@/extensions/dbg_msg_dumps/.libs/dbg_msg_dumps.so
diff --git a/tests/sample-volte.conf.in b/tests/sample-volte.conf.in
index 98ea115604..39a9f04428 100644
--- a/tests/sample-volte.conf.in
+++ b/tests/sample-volte.conf.in
@@ -8,7 +8,6 @@ mme:
     freeDiameter:
       identity: mme.open-ims.test
       realm: open-ims.test
-      no_sctp: true
 #      port: 3868
 #      sec_port: 5868
       listen_on: 127.0.0.2
@@ -50,7 +49,6 @@ hss:
     freeDiameter:
       identity: hss.open-ims.test
       realm: open-ims.test
-      no_sctp: true
 #      port: 3868
 #      sec_port: 5868
       listen_on: 127.0.0.4
@@ -79,7 +77,6 @@ pgw:
     freeDiameter:
       identity: pgw.open-ims.test
       realm: open-ims.test
-      no_sctp: true
 #      port: 3868
 #      sec_port: 5868
       listen_on: 127.0.0.3
@@ -126,7 +123,6 @@ pcrf:
     freeDiameter:
       identity: pcrf.open-ims.test
       realm: open-ims.test
-      no_sctp: true
 #      port: 3868
 #      sec_port: 5868
       listen_on: 127.0.0.5
diff --git a/tests/sample.conf.in b/tests/sample.conf.in
index edd5174ecd..5e7c149b59 100644
--- a/tests/sample.conf.in
+++ b/tests/sample.conf.in
@@ -9,7 +9,6 @@ mme:
     freeDiameter:
       identity: mme.localdomain
       realm: localdomain
-      no_sctp: true
       listen_on: 127.0.0.2
       load_extension:
         - module: @abs_top_builddir@/lib/@FREEDIAMETER_DIR@/extensions/dbg_msg_dumps/.libs/dbg_msg_dumps.so
@@ -51,7 +50,6 @@ hss:
     freeDiameter:
       identity: hss.localdomain
       realm: localdomain
-      no_sctp: true
       listen_on: 127.0.0.4
       load_extension:
         - module: @abs_top_builddir@/lib/@FREEDIAMETER_DIR@/extensions/dbg_msg_dumps/.libs/dbg_msg_dumps.so
@@ -77,7 +75,6 @@ pgw:
     freeDiameter:
       identity: pgw.localdomain
       realm: localdomain
-      no_sctp: true
       listen_on: 127.0.0.3
       load_extension:
         - module: @abs_top_builddir@/lib/@FREEDIAMETER_DIR@/extensions/dbg_msg_dumps/.libs/dbg_msg_dumps.so
@@ -111,7 +108,6 @@ pcrf:
     freeDiameter:
       identity: pcrf.localdomain
       realm: localdomain
-      no_sctp: true
       listen_on: 127.0.0.5
       load_extension:
         - module: @abs_top_builddir@/lib/@FREEDIAMETER_DIR@/extensions/dbg_msg_dumps/.libs/dbg_msg_dumps.so