diff --git a/src/nm-dispatcher.c b/src/nm-dispatcher.c
index fafc9041a5..7cf93f8411 100644
--- a/src/nm-dispatcher.c
+++ b/src/nm-dispatcher.c
@@ -329,7 +329,7 @@ _dispatcher_call (DispatcherAction action,
 		                   device_ip6_props,
 		                   device_dhcp4_props,
 		                   device_dhcp6_props);
-		if (vpn_iface)
+		if (vpn_ip4_config || vpn_ip6_config)
 			fill_vpn_props (vpn_ip4_config, vpn_ip6_config, vpn_ip4_props, vpn_ip6_props);
 	}