diff --git a/modules/context/secret.go b/modules/context/secret.go
index fcb488d211a0a..db4d9436b7a80 100644
--- a/modules/context/secret.go
+++ b/modules/context/secret.go
@@ -12,6 +12,7 @@ import (
 	"encoding/base64"
 	"errors"
 	"io"
+	"strings"
 )
 
 // NewSecret creates a new secret
@@ -34,7 +35,11 @@ func randomBytes(len int64) ([]byte, error) {
 
 func randomString(len int64) (string, error) {
 	b, err := randomBytes(len)
-	return base64.URLEncoding.EncodeToString(b), err
+	if err != nil {
+		return "", err
+	}
+	encoded := base64.URLEncoding.EncodeToString(b)
+	return strings.TrimRight(encoded, "="), nil
 }
 
 // AesEncrypt encrypts text and given key with AES.