diff --git a/pfsense_zbx.php b/pfsense_zbx.php
index 27fed22..830b913 100644
--- a/pfsense_zbx.php
+++ b/pfsense_zbx.php
@@ -43,7 +43,7 @@ function pfz_test(){
 
         $ifdescrs = get_configured_interface_with_descr(true);
         $ifaces=array();
-        foreach ($ifdescrs as $ifdescr => $ifname){	     
+        foreach ($ifdescrs as $ifdescr => $ifname){	   
           $ifinfo = get_interface_info($ifdescr);
           $ifaces[$ifname] = $ifinfo;
         }
@@ -162,7 +162,11 @@ function pfz_openvpn_servervalue($server_id,$valuekey){
                if ($valuekey=="status") {
                     if ( ($server['mode']=="server_user") || ($server['mode']=="server_tls_user") || ($server['mode']=="server_tls") ){
                          if ($value=="") $value="server_user_listening";                    
-                    }                    
+                    } else if ($server['mode']=="p2p_tls"){
+                        // For p2p_tls, ensure we have one client, and return up if it's the case
+                        if ($value=="")
+                            $value=(is_array($server["conns"]) && count($server["conns"]) > 0) ? "up" : "down";
+                    }
                }
           }
      }