diff --git a/src/nm-ip4-config.c b/src/nm-ip4-config.c
index d6f6a9b3fc..75caf7e33c 100644
--- a/src/nm-ip4-config.c
+++ b/src/nm-ip4-config.c
@@ -567,10 +567,6 @@ nm_ip4_config_create_setting (const NMIP4Config *config)
 			continue;
 		}
 
-		/* FIXME: NMIPAddress doesn't support zero prefixes. */
-		if (address->plen == 0)
-			continue;
-
 		/* Static address found. */
 		if (!method)
 			method = NM_SETTING_IP4_CONFIG_METHOD_MANUAL;
diff --git a/src/nm-ip6-config.c b/src/nm-ip6-config.c
index 0b32901bf1..8e7bd22cc1 100644
--- a/src/nm-ip6-config.c
+++ b/src/nm-ip6-config.c
@@ -556,10 +556,6 @@ nm_ip6_config_create_setting (const NMIP6Config *config)
 			continue;
 		}
 
-		/* FIXME: NMIPAddress does not support zero prefixes. */
-		if (address->plen == 0)
-			continue;
-
 		/* Static address found. */
 		if (!method || strcmp (method, NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL) == 0)
 			method = NM_SETTING_IP6_CONFIG_METHOD_MANUAL;