diff --git a/conf/autoload_configs/sofia.conf.xml b/conf/autoload_configs/sofia.conf.xml
index 50c31acf48..24252d08ce 100644
--- a/conf/autoload_configs/sofia.conf.xml
+++ b/conf/autoload_configs/sofia.conf.xml
@@ -2,6 +2,8 @@
 
   <global_settings>
     <param name="log-level" value="0"/>
+    <!-- <param name="auto-restart" value="false"/> -->
+    <param name="debug-presence" value="0"/>
   </global_settings>
 
   <!--
diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.c b/src/mod/endpoints/mod_sofia/mod_sofia.c
index 70b56b6ca9..21bd84391a 100644
--- a/src/mod/endpoints/mod_sofia/mod_sofia.c
+++ b/src/mod/endpoints/mod_sofia/mod_sofia.c
@@ -2686,7 +2686,7 @@ static void general_event_handler(switch_event_t *event)
 		{
 			const char *cond = switch_event_get_header(event, "condition");
 
-			if (cond && !strcmp(cond, "network-address-change")) {
+			if (cond && !strcmp(cond, "network-address-change") && mod_sofia_globals.auto_restart) {
 				sofia_glue_restart_all_profiles();
 			}
 			
diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.h b/src/mod/endpoints/mod_sofia/mod_sofia.h
index 55b8a6de62..89d85bed56 100644
--- a/src/mod/endpoints/mod_sofia/mod_sofia.h
+++ b/src/mod/endpoints/mod_sofia/mod_sofia.h
@@ -243,6 +243,7 @@ struct mod_sofia_globals {
 	switch_event_node_t *custom_node;
 	switch_event_node_t *mwi_node;
 	int debug_presence;
+	int auto_restart;
 };
 extern struct mod_sofia_globals mod_sofia_globals;
 
diff --git a/src/mod/endpoints/mod_sofia/sofia.c b/src/mod/endpoints/mod_sofia/sofia.c
index d15cd05b83..8d33176d4f 100644
--- a/src/mod/endpoints/mod_sofia/sofia.c
+++ b/src/mod/endpoints/mod_sofia/sofia.c
@@ -1571,6 +1571,8 @@ switch_status_t config_sofia(int reload, char *profile_name)
 		goto done;
 	}
 
+	mod_sofia_globals.auto_restart = SWITCH_TRUE;
+
 	if ((settings = switch_xml_child(cfg, "global_settings"))) {
 		for (param = switch_xml_child(settings, "param"); param; param = param->next) {
 			char *var = (char *) switch_xml_attr_soft(param, "name");
@@ -1579,6 +1581,8 @@ switch_status_t config_sofia(int reload, char *profile_name)
 				su_log_set_level(NULL, atoi(val));
 			} else if (!strcasecmp(var, "debug-presence")) {
 				mod_sofia_globals.debug_presence = atoi(val);
+			} else if (!strcasecmp(var, "auto-restart")) {
+				mod_sofia_globals.auto_restart = switch_true(val);
 			}
 		}
 	}