diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h
index 83643b9ac7..0d4b925dc3 100644
--- a/libnm-core/nm-core-internal.h
+++ b/libnm-core/nm-core-internal.h
@@ -113,7 +113,10 @@
 #define NM_BRIDGE_PRIORITY_DEF 0x8000u
 #define NM_BRIDGE_PRIORITY_MAX ((guint) G_MAXUINT16)
 
-#define BRIDGE_MULTICAST_LAST_MEMBER_COUNT_DEFAULT         2
+#define NM_BRIDGE_MULTICAST_LAST_MEMBER_COUNT_MIN 0u
+#define NM_BRIDGE_MULTICAST_LAST_MEMBER_COUNT_DEF 2u
+#define NM_BRIDGE_MULTICAST_LAST_MEMBER_COUNT_MAX ((guint) G_MAXUINT32)
+
 #define BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL_DEFAULT      100
 #define BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL_DEFAULT       26000
 #define BRIDGE_MULTICAST_QUERIER_INTERVAL_DEFAULT          25500
diff --git a/libnm-core/nm-setting-bridge.c b/libnm-core/nm-setting-bridge.c
index c2a97e744a..1d2e58a8eb 100644
--- a/libnm-core/nm-setting-bridge.c
+++ b/libnm-core/nm-setting-bridge.c
@@ -1573,7 +1573,7 @@ nm_setting_bridge_init (NMSettingBridge *setting)
 	priv->forward_delay                     = NM_BRIDGE_FORWARD_DELAY_DEF;
 	priv->hello_time                        = NM_BRIDGE_HELLO_TIME_DEF;
 	priv->max_age                           = NM_BRIDGE_MAX_AGE_DEF;
-	priv->multicast_last_member_count       = BRIDGE_MULTICAST_LAST_MEMBER_COUNT_DEFAULT;
+	priv->multicast_last_member_count       = NM_BRIDGE_MULTICAST_LAST_MEMBER_COUNT_DEF;
 	priv->multicast_last_member_interval    = BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL_DEFAULT;
 	priv->multicast_membership_interval     = BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL_DEFAULT;
 	priv->multicast_hash_max                = NM_BRIDGE_MULTICAST_HASH_MAX_DEF;
@@ -2105,7 +2105,7 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
 	 */
 	obj_properties[PROP_MULTICAST_LAST_MEMBER_COUNT] =
 	    g_param_spec_uint (NM_SETTING_BRIDGE_MULTICAST_LAST_MEMBER_COUNT, "", "",
-	                       0, G_MAXUINT32, BRIDGE_MULTICAST_LAST_MEMBER_COUNT_DEFAULT,
+	                       NM_BRIDGE_MULTICAST_LAST_MEMBER_COUNT_MIN, NM_BRIDGE_MULTICAST_LAST_MEMBER_COUNT_MAX, NM_BRIDGE_MULTICAST_LAST_MEMBER_COUNT_DEF,
 	                       G_PARAM_READWRITE |
 	                       NM_SETTING_PARAM_INFERRABLE |
 	                       G_PARAM_STATIC_STRINGS);
diff --git a/src/devices/nm-device-bridge.c b/src/devices/nm-device-bridge.c
index 3e56d94286..1926197ed7 100644
--- a/src/devices/nm-device-bridge.c
+++ b/src/devices/nm-device-bridge.c
@@ -280,7 +280,7 @@ static const Option master_options[] = {
 	                                                             FALSE, FALSE, FALSE },
 	{ NM_SETTING_BRIDGE_MULTICAST_LAST_MEMBER_COUNT,             "multicast_last_member_count",
 	                                                             NULL, NULL,
-	                                                             0, G_MAXUINT32, 2,
+	                                                             NM_BRIDGE_MULTICAST_LAST_MEMBER_COUNT_MIN, NM_BRIDGE_MULTICAST_LAST_MEMBER_COUNT_MAX, NM_BRIDGE_MULTICAST_LAST_MEMBER_COUNT_DEF,
 	                                                             FALSE, FALSE, FALSE },
 	{ NM_SETTING_BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL,          "multicast_last_member_interval",
 	                                                             NULL, NULL,