diff --git a/atlassian-connect-core.cabal b/atlassian-connect-core.cabal
--- a/atlassian-connect-core.cabal
+++ b/atlassian-connect-core.cabal
@@ -10,7 +10,7 @@
 -- PVP summary:      +-+------- breaking API changes
 --                   | | +----- non-breaking API additions
 --                   | | | +--- code changes with no API change
-version:             0.8.0.0
+version:             0.8.0.1
 
 -- A short (one-line) description of the package.
 synopsis:            Atlassian Connect snaplet for the Snap Framework and helper code.
diff --git a/src/Snap/AtlassianConnect/QueryStringHash.hs b/src/Snap/AtlassianConnect/QueryStringHash.hs
--- a/src/Snap/AtlassianConnect/QueryStringHash.hs
+++ b/src/Snap/AtlassianConnect/QueryStringHash.hs
@@ -104,12 +104,12 @@
 
 joinQueryParam :: [QueryParam] -> Maybe (T.Text, T.Text)
 joinQueryParam [] = Nothing
-joinQueryParam xs@(x : _) = return (fst x, T.intercalate sep . catMaybes . fmap snd $ xs)
+joinQueryParam xs@(x : _) = return (encode . fst $ x, T.intercalate sep . fmap encode . catMaybes . fmap snd $ xs)
    where
       sep = T.singleton ','
 
 queryParamToString :: (T.Text, T.Text) -> T.Text
-queryParamToString (key, value) = encode key <> T.singleton '=' <> encode value
+queryParamToString (key, value) = key <> T.singleton '=' <> value
 
 render :: [(T.Text, T.Text)] -> T.Text
 render = T.intercalate "&" . fmap queryParamToString