diff --git a/LibreNMS/Util/Url.php b/LibreNMS/Util/Url.php
index 6bf4294e5a..a056d948f9 100644
--- a/LibreNMS/Util/Url.php
+++ b/LibreNMS/Util/Url.php
@@ -294,7 +294,7 @@ class Url
         $url = empty($vars) ? '' : $prefix;
         foreach ($vars as $var => $value) {
             if ($value == '0' || $value != '' && ! Str::contains($var, 'opt') && ! is_numeric($var)) {
-                $url .= $var . '=' . urlencode($value) . '/';
+                $url .= urlencode($var) . '=' . urlencode($value) . '/';
             }
         }