diff --git a/src/runtime/index.ts b/src/runtime/index.ts
index 83c0a76..9530604 100644
--- a/src/runtime/index.ts
+++ b/src/runtime/index.ts
@@ -67,7 +67,7 @@ function select_route(url: URL): Target {
 			if (url.search.length > 0) {
 				url.search.slice(1).split('&').forEach(searchParam => {
 					const [, key, value] = /([^=]+)=(.*)/.exec(searchParam);
-					query[key] = value || true;
+					query[key] = value ? decodeURIComponent(value.replace(/\+/g, ' ')) : true;
 				});
 			}
 			return { url, path, page, match, query };
diff --git a/test/app/routes/echo/page/[slug].html b/test/app/routes/echo/page/[slug].html
index f393c6a..7b2f0a8 100644
--- a/test/app/routes/echo/page/[slug].html
+++ b/test/app/routes/echo/page/[slug].html
@@ -1,10 +1,11 @@
-<h1>{slug}</h1>
+<h1>{slug} ({message})</h1>
 
 <script>
 	export default {
-		preload({ params }) {
+		preload({ params, query }) {
 			return {
-				slug: params.slug
+				slug: params.slug,
+				message: query.message
 			};
 		}
 	};
diff --git a/test/app/routes/index.html b/test/app/routes/index.html
index 9ecc6a7..3b889ef 100644
--- a/test/app/routes/index.html
+++ b/test/app/routes/index.html
@@ -15,7 +15,7 @@
 <a href='credentials?creds=include'>credentials</a>
 <a rel=prefetch class='{page === "blog"  ? "selected" : ""}' href='blog'>blog</a>
 <a href="const">const</a>
-<a href="echo/page/encöding">echo/page/encöding</a>
+<a href="echo/page/encöded?message=hëllö+wörld">echo/page/encöded?message=hëllö+wörld</a>
 
 <div class='hydrate-test'></div>
 
diff --git a/test/common/test.js b/test/common/test.js
index 91240c3..b43268a 100644
--- a/test/common/test.js
+++ b/test/common/test.js
@@ -752,21 +752,21 @@ function run({ mode, basepath = '' }) {
 					});
 			});
 
-			it('encodes req.params for server-rendered pages', () => {
-				return nightmare.goto(`${base}/echo/page/encöded`)
+			it('encodes req.params and req.query for server-rendered pages', () => {
+				return nightmare.goto(`${base}/echo/page/encöded?message=hëllö+wörld`)
 					.page.title()
 					.then(title => {
-						assert.equal(title, 'encöded');
+						assert.equal(title, 'encöded (hëllö wörld)');
 					});
 			});
 
-			it('encodes req.params for client-rendered pages', () => {
+			it('encodes req.params and req.query for client-rendered pages', () => {
 				return nightmare.goto(base).init()
-					.click('a[href="echo/page/encöding"]')
+					.click('a[href="echo/page/encöded?message=hëllö+wörld"]')
 					.wait(100)
 					.page.title()
 					.then(title => {
-						assert.equal(title, 'encöding');
+						assert.equal(title, 'encöded (hëllö wörld)');
 					});
 			});