diff --git a/internal/core/url.go b/internal/core/url.go
index bc00dd1..0cd2bd0 100644
--- a/internal/core/url.go
+++ b/internal/core/url.go
@@ -3,9 +3,39 @@ package core
 import (
 	"fmt"
 	nurl "net/url"
+	"sort"
 	"strings"
 )
 
+// queryEncodeWithoutEmptyValues is a copy of `values.Encode` but checking if the queryparam
+// value is empty to prevent sending the = symbol empty which breaks in some servers.
+func queryEncodeWithoutEmptyValues(v nurl.Values) string {
+	if v == nil {
+		return ""
+	}
+	var buf strings.Builder
+	keys := make([]string, 0, len(v))
+	for k := range v {
+		keys = append(keys, k)
+	}
+	sort.Strings(keys)
+	for _, k := range keys {
+		vs := v[k]
+		keyEscaped := nurl.QueryEscape(k)
+		for _, v := range vs {
+			if buf.Len() > 0 {
+				buf.WriteByte('&')
+			}
+			buf.WriteString(keyEscaped)
+			if v != "" {
+				buf.WriteByte('=')
+				buf.WriteString(nurl.QueryEscape(v))
+			}
+		}
+	}
+	return buf.String()
+}
+
 // RemoveUTMParams removes the UTM parameters from URL.
 func RemoveUTMParams(url string) (string, error) {
 	// Parse string URL
@@ -23,6 +53,6 @@ func RemoveUTMParams(url string) (string, error) {
 	}
 
 	tmp.Fragment = ""
-	tmp.RawQuery = queries.Encode()
+	tmp.RawQuery = queryEncodeWithoutEmptyValues(queries)
 	return tmp.String(), nil
 }