diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index 4144c2a1b9..de93f2233c 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -9862,13 +9862,16 @@ gboolean
 nm_device_dhcp6_renew(NMDevice *self, gboolean release)
 {
     NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE(self);
+    NMNDiscDHCPLevel mode;
 
     g_return_val_if_fail(priv->dhcp_data_6.client != NULL, FALSE);
 
     _LOGI(LOGD_DHCP6, "DHCPv6 lease renewal requested");
 
     /* Terminate old DHCP instance and release the old lease */
+    mode = priv->dhcp6.mode;
     dhcp6_cleanup(self, CLEANUP_TYPE_DECONFIGURE, release);
+    priv->dhcp6.mode = mode;
 
     /* Start DHCP again on the interface */
     return dhcp6_start(self, FALSE);
diff --git a/src/dhcp/nm-dhcp-dhclient.c b/src/dhcp/nm-dhcp-dhclient.c
index 260f400e3e..5dc1e9ec67 100644
--- a/src/dhcp/nm-dhcp-dhclient.c
+++ b/src/dhcp/nm-dhcp-dhclient.c
@@ -437,6 +437,12 @@ dhclient_start(NMDhcpClient *client,
 
     if (addr_family == AF_INET6) {
         g_ptr_array_add(argv, (gpointer) "-6");
+
+        if (prefixes > 0 && nm_streq0(mode_opt, "-S")) {
+            /* -S is incompatible with -P, only use the latter */
+            mode_opt = NULL;
+        }
+
         if (mode_opt)
             g_ptr_array_add(argv, (gpointer) mode_opt);
         while (prefixes--)
diff --git a/src/dhcp/nm-dhcp-systemd.c b/src/dhcp/nm-dhcp-systemd.c
index f929722377..09d11713ee 100644
--- a/src/dhcp/nm-dhcp-systemd.c
+++ b/src/dhcp/nm-dhcp-systemd.c
@@ -969,8 +969,11 @@ ip6_start(NMDhcpClient *            client,
 
     _LOGT("dhcp-client6: set %p", sd_client);
 
-    if (nm_dhcp_client_get_info_only(client))
-        sd_dhcp6_client_set_information_request(sd_client, 1);
+    if (nm_dhcp_client_get_info_only(client)) {
+        sd_dhcp6_client_set_address_request(sd_client, 0);
+        if (needed_prefixes == 0)
+            sd_dhcp6_client_set_information_request(sd_client, 1);
+    }
 
     r = sd_dhcp6_client_set_iaid(sd_client, nm_dhcp_client_get_iaid(client));
     if (r < 0) {