diff --git a/NAMESPACE b/NAMESPACE
index 756c37a7e..4b2bfff8a 100644
--- a/NAMESPACE
+++ b/NAMESPACE
@@ -28,9 +28,9 @@ import(stringi)
 importFrom(grDevices,dev.off)
 importFrom(grDevices,jpeg)
 importFrom(grDevices,png)
+importFrom(httpuv,decodeURI)
+importFrom(httpuv,encodeURI)
 importFrom(httpuv,runServer)
 importFrom(stats,runif)
-importFrom(utils,URLdecode)
-importFrom(utils,URLencode)
 importFrom(utils,compareVersion)
 importFrom(utils,packageVersion)
diff --git a/R/cookie-parser.R b/R/cookie-parser.R
index 4f223c6c6..70695ad33 100644
--- a/R/cookie-parser.R
+++ b/R/cookie-parser.R
@@ -4,7 +4,7 @@ cookieFilter <- function(req){
   forward()
 }
 
-#' @importFrom utils URLdecode
+#' @importFrom httpuv decodeURI
 #' @noRd
 parseCookies <- function(cookie){
   if (is.null(cookie) || nchar(cookie) == 0){
@@ -25,5 +25,5 @@ parseCookies <- function(cookie){
   cookies <- lapply(cookieList, "[[", 2)
   names(cookies) <- sapply(cookieList, "[[", 1)
 
-  return(lapply(cookies, URLdecode))
+  return(lapply(cookies, decodeURI))
 }
diff --git a/R/post-body.R b/R/post-body.R
index d73b235a7..29a3c24e2 100644
--- a/R/post-body.R
+++ b/R/post-body.R
@@ -11,7 +11,6 @@ postBodyFilter <- function(req){
   forward()
 }
 
-#' @importFrom utils URLdecode
 #' @noRd
 parseBody <- function(body, charset = "UTF-8"){
   # The body in a curl call can also include querystring formatted data
diff --git a/R/query-string.R b/R/query-string.R
index 31ff4c97f..144224e28 100644
--- a/R/query-string.R
+++ b/R/query-string.R
@@ -9,7 +9,6 @@ queryStringFilter <- function(req){
   forward()
 }
 
-#' @importFrom utils URLdecode
 #' @noRd
 parseQS <- function(qs){
   if (is.null(qs) || length(qs) == 0 || qs == "") {
@@ -24,11 +23,11 @@ parseQS <- function(qs){
   kv <- kv[sapply(kv, length) == 2] # Ignore incompletes
 
   keys <- sapply(kv, "[[", 1)
-  keys <- unname(sapply(keys, URLdecode))
+  keys <- unname(sapply(keys, decodeURI))
 
   vals <- sapply(kv, "[[", 2)
   vals[is.na(vals)] <- ""
-  vals <- unname(sapply(vals, URLdecode))
+  vals <- unname(sapply(vals, decodeURI))
 
   ret <- as.list(vals)
   names(ret) <- keys
diff --git a/R/response.R b/R/response.R
index 75c2445f1..73834c8fc 100644
--- a/R/response.R
+++ b/R/response.R
@@ -41,10 +41,10 @@ PlumberResponse <- R6Class(
   )
 )
 
-#' @importFrom utils URLencode
+#' @importFrom httpuv encodeURI
 #' @noRd
 cookieToStr <- function(name, value, path, expiration=FALSE, http=FALSE, secure=FALSE){
-  val <- URLencode(as.character(value))
+  val <- encodeURI(as.character(value))
   str <- paste0(name, "=", val, "; ")
 
   if (!missing(path)){