diff --git a/src/messages/shutdown.cc b/src/messages/shutdown.cc
index cb6c85f1..7a853020 100644
--- a/src/messages/shutdown.cc
+++ b/src/messages/shutdown.cc
@@ -4,8 +4,9 @@
 namespace {
 struct Ipc_Shutdown : public IpcMessage<Ipc_Shutdown> {
   static const IpcId kIpcId = IpcId::Shutdown;
+  lsRequestId id;
 };
-MAKE_REFLECT_EMPTY_STRUCT(Ipc_Shutdown);
+MAKE_REFLECT_EMPTY_STRUCT(Ipc_Shutdown, id);
 REGISTER_IPC_MESSAGE(Ipc_Shutdown);
 
 struct Out_Shutdown : public lsOutMessage<Out_Shutdown> {
@@ -17,6 +18,7 @@ MAKE_REFLECT_STRUCT(Out_Shutdown, jsonrpc, id, result);
 struct ShutdownHandler : BaseMessageHandler<Ipc_Shutdown> {
   void Run(Ipc_Shutdown* request) override {
     Out_Shutdown out;
+    out.id = request->id;
     QueueManager::WriteStdout(IpcId::TextDocumentDefinition, out);
   }
 };