diff --git a/src/RequestHandler.php b/src/RequestHandler.php
index e476781..aeefce3 100644
--- a/src/RequestHandler.php
+++ b/src/RequestHandler.php
@@ -90,7 +90,8 @@ class RequestHandler extends RestRequestHandler {
       $content = $serializer->serialize($error_exception, $format);
       // Add the default content type, but only if the headers from the
       // exception have not specified it already.
-      $headers = $error_exception->getHeaders() + array('Content-Type' => $request->getMimeType($format));
+      $headers = $error_exception->getHeaders() +
+          array('Content-Type' => $request->getMimeType($format), 'Location' => $request->getUri());
       $response = new Response($content, $error_exception->getStatusCode(), $headers);
     }
     $error_handler->restore();
@@ -151,6 +152,8 @@ class RequestHandler extends RestRequestHandler {
     }
 
     $response->headers->set('Content-Type', $request->getMimeType($format));
+    $response->headers->set('Location', $request->getUri());
+
     // Add rest settings config's cache tags.
     $response->addCacheableDependency($this->container->get('config.factory')
       ->get('jsonapi.resource_info'));
@@ -197,7 +200,8 @@ class RequestHandler extends RestRequestHandler {
       $content = $serializer->serialize($error_exception, $format);
       // Add the default content type, but only if the headers from the
       // exception have not specified it already.
-      $headers = $error_exception->getHeaders() + array('Content-Type' => $request->getMimeType($format));
+      $headers = $error_exception->getHeaders() +
+          ['Content-Type' => $request->getMimeType($format), 'Location' => $request->getUri()];
       return new Response($content, $error_exception->getStatusCode(), $headers);
     }
   }
diff --git a/tests/src/Unit/RequestHandlerTest.php b/tests/src/Unit/RequestHandlerTest.php
index add04b1..54a0a94 100644
--- a/tests/src/Unit/RequestHandlerTest.php
+++ b/tests/src/Unit/RequestHandlerTest.php
@@ -33,6 +33,7 @@ class RequestHandlerTest extends UnitTestCase  {
     $request_handler = new RequestHandler($entity_storage->reveal());
     $request = $this->prophesize(Request::class);
     $request->getContentType()->willReturn(NULL);
+    $request->getUri()->willReturn(NULL);
     $request->getContent()->willReturn('this is not used');
     $request->getMethod()->willReturn(NULL);
     $request->get(Argument::any())->willReturn(NULL);