diff --git a/index.js b/index.js
index e7237d5..08c9dd4 100644
--- a/index.js
+++ b/index.js
@@ -14,7 +14,7 @@ const register = function (server, pluginOptions) {
 
     if (redirect) {
       return h
-        .redirect('https://' + host + request.url.path)
+        .redirect('https://' + host + request.url.pathname + request.url.search)
         .code(301)
         .takeover();
     }
diff --git a/package.json b/package.json
index 5edd9a0..7678d92 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
   },
   "homepage": "https://github.com/bendrucker/hapi-require-https",
   "devDependencies": {
-    "hapi": "^16.0.1",
+    "@hapi/hapi": "^18.4.0",
     "standard": "^8.0.0",
     "tape": "~4.6.0",
     "test-peer-range": "~1.0.1"
diff --git a/test.js b/test.js
index d8d64eb..0b0d0da 100644
--- a/test.js
+++ b/test.js
@@ -1,7 +1,7 @@
 'use strict'
 
 var test = require('tape')
-var hapi = require('hapi')
+var hapi = require('@hapi/hapi')
 var http = require('http')
 var plugin = require('./index.js')