diff --git a/etc/rc.openvpn b/etc/rc.openvpn
index 159912ba7e..8d27534ece 100755
--- a/etc/rc.openvpn
+++ b/etc/rc.openvpn
@@ -45,8 +45,13 @@
 	
 	if(isset($config['openvpn']['enable']))
 		log_error("OpenVPN: One or more OpenVPN tunnel endpoints may have changed its IP. Reloading.");
-
-	openvpn_resync_all();
+	
+	$gwgroups = return_gateway_groups_array();
+	foreach($config['openvpn']['openvpn-server'] as &$server) {
+		if(is_array($gwgroups[$server['interface']])) {
+			openvpn_resync('server', $server);
+		}
+	}
 
 	unlock($openvpnlck);
 ?>