diff --git a/README.md b/README.md
index 78ecb94..a4808ff 100644
--- a/README.md
+++ b/README.md
@@ -101,12 +101,29 @@ fastify.get('/*', { websocket: true }, (connection, request) => {
   })
 })
 ```
+### Using hooks
+
+Routes registered with `fastify-websocket` respect the Fastify plugin encapsulation contexts, and so will run any hooks that have been registered. This means the same route hooks you might use for authentication or error handling of plain old HTTP handlers will apply to websocket handlers as well.
+
+```js
+fastify.addHook('preValidation', async (request, reply) => {
+  // check if the request is authenticated
+  if (!request.isAuthenticated()) {
+    await reply.code(401).send("not authenticated");
+  }
+})
+fastify.get('/', { websocket: true }, (connection, req) => {
+  // the connection will only be opened for authenticated incoming requests
+  connection.socket.on('message', message => {
+    // ...
+  })
+})
+```
 
 **NB**
 This plugin uses the same router as the `fastify` instance, this has a few implications to take into account:
-- Websocket route handlers follow the usual `fastify` request lifecycle.
+- Websocket route handlers follow the usual `fastify` request lifecycle, which means hooks, error handlers, and decorators all work the same way as other route handlers.
 - You can access the fastify server via `this` in your handlers
-- You can access the fastify request decorations via the `req` object your handlers
 - When using `fastify-websocket`, it needs to be registered before all routes in order to be able to intercept websocket connections to existing routes and close the connection on non-websocket routes.
 
 ```js
diff --git a/index.js b/index.js
index 779bef6..cfbdd7d 100644
--- a/index.js
+++ b/index.js
@@ -47,6 +47,7 @@ function fastifyWebsocket (fastify, opts, next) {
       })
     } else {
       const rawResponse = new ServerResponse(rawRequest)
+      rawResponse.assignSocket(socket)
       fastify.routing(rawRequest, rawResponse)
     }
   })
diff --git a/test/hooks.js b/test/hooks.js
index b5ec518..83ebe4b 100644
--- a/test/hooks.js
+++ b/test/hooks.js
@@ -99,6 +99,65 @@ test('Should run onError hook before handler is executed (error thrown in onRequ
   })
 })
 
+test('Should run onError hook before handler is executed (error thrown in preValidation hook)', t => {
+  t.plan(3)
+  const fastify = Fastify()
+
+  t.teardown(() => fastify.close())
+
+  fastify.register(fastifyWebsocket)
+
+  fastify.addHook('preValidation', async (request, reply) => {
+    await Promise.resolve()
+    throw new Error('Fail')
+  })
+
+  fastify.addHook('onError', async (request, reply) => t.ok('called', 'onError'))
+
+  fastify.get('/echo', { websocket: true }, (conn, request) => {
+    t.fail()
+  })
+
+  fastify.listen(0, function (err) {
+    t.error(err)
+    const ws = new WebSocket('ws://localhost:' + (fastify.server.address()).port + '/echo')
+    const client = WebSocket.createWebSocketStream(ws, { encoding: 'utf8' })
+    t.teardown(client.destroy.bind(client))
+    ws.on('close', code => t.equal(code, 1006))
+  })
+})
+
+test('onError hooks can send a reply and prevent hijacking', t => {
+  t.plan(3)
+  const fastify = Fastify()
+
+  t.teardown(() => fastify.close())
+
+  fastify.register(fastifyWebsocket)
+
+  fastify.addHook('preValidation', async (request, reply) => {
+    await Promise.resolve()
+    throw new Error('Fail')
+  })
+
+  fastify.addHook('onError', async (request, reply) => {
+    t.ok('called', 'onError')
+    await reply.code(404).send('there was an error')
+  })
+
+  fastify.get('/echo', { websocket: true }, (conn, request) => {
+    t.fail()
+  })
+
+  fastify.listen(0, function (err) {
+    t.error(err)
+    const ws = new WebSocket('ws://localhost:' + (fastify.server.address()).port + '/echo')
+    const client = WebSocket.createWebSocketStream(ws, { encoding: 'utf8' })
+    t.teardown(client.destroy.bind(client))
+    ws.on('close', code => t.equal(code, 1006))
+  })
+})
+
 test('Should not run onError hook if reply was already hijacked (error thrown in websocket handler)', t => {
   t.plan(2)
   const fastify = Fastify()
@@ -172,6 +231,8 @@ test('Should not hijack reply for a normal http request in the internal onError
     const port = fastify.server.address().port
 
     const httpClient = net.createConnection({ port: port }, () => {
+      t.teardown(httpClient.destroy.bind(httpClient))
+
       httpClient.write('GET / HTTP/1.1\r\n\r\n')
       httpClient.once('data', data => {
         t.match(data.toString(), /Fail/i)
@@ -221,3 +282,57 @@ test('Should run async hooks and still deliver quickly sent messages', (t) => {
     })
   })
 })
+
+test('Should not hijack reply for an normal request to a websocket route that is sent a normal HTTP response in a hook', t => {
+  t.plan(2)
+  const fastify = Fastify()
+  t.teardown(() => fastify.close())
+
+  fastify.register(fastifyWebsocket)
+  fastify.addHook('preValidation', async (request, reply) => {
+    await Promise.resolve()
+    await reply.code(404).send('not found')
+  })
+  fastify.get('/echo', { websocket: true }, (conn, request) => {
+    t.fail()
+  })
+
+  fastify.listen(0, err => {
+    t.error(err)
+
+    const port = fastify.server.address().port
+
+    const httpClient = net.createConnection({ port: port }, () => {
+      t.teardown(httpClient.destroy.bind(httpClient))
+      httpClient.write('GET /echo HTTP/1.1\r\n\r\n')
+      httpClient.once('data', data => {
+        t.match(data.toString(), /not found/i)
+      })
+    })
+  })
+})
+
+test('Should not hijack reply for an WS request to a WS route that gets sent a normal HTTP response in a hook', t => {
+  t.plan(2)
+  const fastify = Fastify()
+  t.teardown(() => fastify.close())
+
+  fastify.register(fastifyWebsocket)
+  fastify.addHook('preValidation', async (request, reply) => {
+    await Promise.resolve()
+    await reply.code(404).send('not found')
+  })
+  fastify.get('/echo', { websocket: true }, (conn, request) => {
+    t.fail()
+  })
+
+  fastify.listen(0, err => {
+    t.error(err)
+
+    const ws = new WebSocket('ws://localhost:' + (fastify.server.address()).port + '/echo')
+    const client = WebSocket.createWebSocketStream(ws, { encoding: 'utf8' })
+    t.teardown(client.destroy.bind(client))
+
+    client.on('error', error => t.ok(error))
+  })
+})