diff -Naur connman-1.34-org/src/ipconfig.c connman-1.34/src/ipconfig.c
--- connman-1.34-org/src/ipconfig.c	2019-07-12 06:41:15.893650002 -0400
+++ connman-1.34/src/ipconfig.c	2019-07-15 05:42:18.907263979 -0400
@@ -2335,8 +2335,10 @@
 	if (ipconfig->address->gateway)
 		g_key_file_set_string(keyfile, identifier,
 			key, ipconfig->address->gateway);
-	else
-		g_key_file_remove_key(keyfile, identifier, key, NULL);
+	/* ooma: Do not remove gateway field from settings file.
+	 * Otherwise, a sequence of actions will cause issues. 
+	 * Service Disconnect -> New Settings over DBus -> Service Connect.
+	 */
 	g_free(key);
 
 	return 0;
