diff --git a/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Write_Bridge_Main b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Write_Bridge_Main
index 49a7372384..03182b4379 100644
--- a/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Write_Bridge_Main
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Write_Bridge_Main
@@ -9,7 +9,8 @@ interface-name=br0
 [bridge]
 
 [ipv4]
-address1=1.2.3.4/24,1.1.1.1
+address1=1.2.3.4/24
+gateway=1.1.1.1
 method=manual
 
 [ipv6]
diff --git a/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Write_Wired b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Write_Wired
index 0b377c826b..69ca9a6dc2 100644
--- a/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Write_Wired
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Write_Wired
@@ -10,9 +10,10 @@ mac-address=99:88:77:66:55:44
 mtu=900
 
 [ipv4]
-address1=192.168.0.5/24,192.168.0.1
+address1=192.168.0.5/24
 address2=1.2.3.4/8
 dns=4.2.2.1;4.2.2.2;
+gateway=192.168.0.1
 method=manual
 route1=10.10.10.2/24,10.10.10.1,3
 route2=1.1.1.1/8,1.2.1.1,1
diff --git a/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Write_Wired_IP6 b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Write_Wired_IP6
index 1efa7406c2..cc379ec66c 100644
--- a/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Write_Wired_IP6
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Write_Wired_IP6
@@ -11,9 +11,10 @@ method=disabled
 
 [ipv6]
 addr-gen-mode=default
-address1=abcd::beef/64,dcba::beef
+address1=abcd::beef/64
 dns=1::cafe;
 dns-search=wallaceandgromit.com;
+gateway=dcba::beef
 method=manual
 
 [proxy]
diff --git a/src/libnm-core-impl/nm-keyfile.c b/src/libnm-core-impl/nm-keyfile.c
index 4e905f4d6e..93afaedfa0 100644
--- a/src/libnm-core-impl/nm-keyfile.c
+++ b/src/libnm-core-impl/nm-keyfile.c
@@ -2263,11 +2263,7 @@ ip6_addr_gen_mode_writer(KeyfileWriterInfo *info,
 }
 
 static void
-write_ip_values(GKeyFile   *file,
-                const char *setting_name,
-                GPtrArray  *array,
-                const char *gateway,
-                gboolean    is_route)
+write_ip_values(GKeyFile *file, const char *setting_name, GPtrArray *array, gboolean is_route)
 {
     if (array->len > 0) {
         nm_auto_str_buf NMStrBuf output = NM_STR_BUF_INIT(2 * INET_ADDRSTRLEN + 10, FALSE);
@@ -2300,7 +2296,7 @@ write_ip_values(GKeyFile   *file,
 
                 addr = nm_ip_address_get_address(address);
                 plen = nm_ip_address_get_prefix(address);
-                gw   = (i == 0) ? gateway : NULL;
+                gw   = NULL;
             }
 
             nm_str_buf_set_size(&output, 0, FALSE, FALSE);
@@ -2351,11 +2347,10 @@ addr_writer(KeyfileWriterInfo *info, NMSetting *setting, const char *key, const
 {
     GPtrArray  *array;
     const char *setting_name = nm_setting_get_name(setting);
-    const char *gateway      = nm_setting_ip_config_get_gateway(NM_SETTING_IP_CONFIG(setting));
 
     array = (GPtrArray *) g_value_get_boxed(value);
     if (array && array->len)
-        write_ip_values(info->keyfile, setting_name, array, gateway, FALSE);
+        write_ip_values(info->keyfile, setting_name, array, FALSE);
 }
 
 static void
@@ -2366,7 +2361,7 @@ route_writer(KeyfileWriterInfo *info, NMSetting *setting, const char *key, const
 
     array = (GPtrArray *) g_value_get_boxed(value);
     if (array && array->len)
-        write_ip_values(info->keyfile, setting_name, array, NULL, TRUE);
+        write_ip_values(info->keyfile, setting_name, array, TRUE);
 }
 
 static void
@@ -3060,7 +3055,6 @@ static const ParseInfoSetting *const parse_infos[_NM_META_SETTING_TYPE_NUM] = {
                                 .parser              = ip_dns_parser,
                                 .writer              = dns_writer, ),
             PARSE_INFO_PROPERTY(NM_SETTING_IP_CONFIG_DNS_OPTIONS, .always_write = TRUE, ),
-            PARSE_INFO_PROPERTY(NM_SETTING_IP_CONFIG_GATEWAY, .writer_skip = TRUE, ),
             PARSE_INFO_PROPERTY(NM_SETTING_IP_CONFIG_ROUTES,
                                 .parser_no_check_key = TRUE,
                                 .parser              = ip_address_or_route_parser,
@@ -3088,7 +3082,6 @@ static const ParseInfoSetting *const parse_infos[_NM_META_SETTING_TYPE_NUM] = {
                                 .parser              = ip_dns_parser,
                                 .writer              = dns_writer, ),
             PARSE_INFO_PROPERTY(NM_SETTING_IP_CONFIG_DNS_OPTIONS, .always_write = TRUE, ),
-            PARSE_INFO_PROPERTY(NM_SETTING_IP_CONFIG_GATEWAY, .writer_skip = TRUE, ),
             PARSE_INFO_PROPERTY(NM_SETTING_IP_CONFIG_ROUTES,
                                 .parser_no_check_key = TRUE,
                                 .parser              = ip_address_or_route_parser,