diff --git a/server/core/gateway.cc b/server/core/gateway.cc
index 7700b7a85..a77b13138 100644
--- a/server/core/gateway.cc
+++ b/server/core/gateway.cc
@@ -427,6 +427,14 @@ static void sigfatal_handler(int i)
               cnf->sysname,
               cnf->release_string);
 
+    if (DCB* dcb = dcb_get_current())
+    {
+        if (dcb->session)
+        {
+            session_dump_statements(dcb->session);
+        }
+    }
+
     auto cb = [](const char* symbol, const char* cmd) {
             MXS_ALERT("  %s: %s", symbol, cmd);
         };