diff --git a/src/opnsense/mvc/app/controllers/OPNsense/OpenVPN/Api/ExportController.php b/src/opnsense/mvc/app/controllers/OPNsense/OpenVPN/Api/ExportController.php
index 85cf6956d..7c6e5a9c3 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/OpenVPN/Api/ExportController.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/OpenVPN/Api/ExportController.php
@@ -151,7 +151,7 @@ class ExportController extends ApiControllerBase
         foreach ($serverModel->iterateItems() as $field => $value) {
             if (!empty((string)$value)) {
                 $result[$field] = (string)$value;
-            } else {
+            } elseif (!empty((string)$server->$field) || !isset($result[$field])) {
                 $result[$field] = (string)$server->$field;
             }
         }