diff --git a/etc/inc/openvpn.inc b/etc/inc/openvpn.inc
index 549b4068ed..74c445f138 100644
--- a/etc/inc/openvpn.inc
+++ b/etc/inc/openvpn.inc
@@ -394,7 +394,6 @@ EOD;
     if (!empty($settings['tls'])) $openvpn_conf .= "tls-auth {$g['varetc_path']}/openvpn_server{$id}.tls 0\n";
 		if (!empty($settings['maxclients'])) $openvpn_conf .= "max-clients {$settings['maxclients']}\n";
 		if ($settings['gwredir']) $openvpn_conf .= "push \"redirect-gateway def1\"\n";
-		if ($settings['keepalive']) $openvpn_conf .= "keepalive 12 120\n";
 			}
 
 	else { // $mode == client
@@ -555,7 +554,6 @@ function openvpn_resync_csc($id) {
     if (!empty($settings['dhcp_nbtscope'])) $conf .= "push \"dhcp-option NBS {$settings['dhcp_nbtscope']}\"\n";
    	if ($settings['dhcp_nbtdisable']) $conf .= "push \"dhcp-option DISABLE-NBT\"\n";
     if ($settings['gwredir']) $conf .= "push \"redirect-gateway def1\"\n";
-    if ($settings['keepalive']) $conf .= "keepalive 12 120\n";
 
 	if (!empty($settings['custom_options'])) {
 		$options = explode(';', $settings['custom_options']);
diff --git a/usr/local/pkg/openvpn.xml b/usr/local/pkg/openvpn.xml
index b329025de5..f6df929574 100644
--- a/usr/local/pkg/openvpn.xml
+++ b/usr/local/pkg/openvpn.xml
@@ -258,12 +258,6 @@
 			<description>Redirect ALL traffic through the OpenVPN server.</description>
 			<type>checkbox</type>
 		</field>
-		<field>
-			<fieldname>keepalive</fieldname>
-			<fielddescr>Keep alive</fielddescr>
-			<description>Sends bidirectional ICMP-like packets every 10 sec. to ensure hosts are up. Hosts are assumed to be down if no answer was received for 120 sec.</description>
-			<type>checkbox</type>
-		</field>		
     <field>
 			<fieldname>custom_options</fieldname>
 			<fielddescr>Custom options</fielddescr>
diff --git a/usr/local/pkg/openvpn_csc.xml b/usr/local/pkg/openvpn_csc.xml
index 7ce2d32a76..70739ce649 100644
--- a/usr/local/pkg/openvpn_csc.xml
+++ b/usr/local/pkg/openvpn_csc.xml
@@ -149,12 +149,6 @@
 			<description>Redirect ALL traffic through the OpenVPN server.</description>
 			<type>checkbox</type>
 		</field>
-		<field>
-			<fieldname>keepalive</fieldname>
-			<fielddescr>Keep alive</fielddescr>
-			<description>Sends bidirectional ICMP-like packets every 10 sec. to ensure hosts are up. Hosts are assumed to be down if no answer was received for 120 sec.</description>
-			<type>checkbox</type>
-		</field>
 		<field>
 			<fieldname>custom_options</fieldname>
 			<fielddescr>Custom options</fielddescr>