diff --git a/CHANGES.txt b/CHANGES.txt
index 84b85cf7a9..d0b90efcec 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -14,6 +14,7 @@ Merged from 2.2:
  * cqlsh pg-style-strings broken (CASSANDRA-10484)
  * cqlsh prompt includes name of keyspace after failed `use` statement (CASSANDRA-10369)
 Merged from 2.1:
+ * (cqlsh) show partial trace if incomplete after max_trace_wait (CASSANDRA-7645)
  * Allow LOCAL_JMX to be easily overridden (CASSANDRA-10275)
  * Mark nodes as dead even if they've already left (CASSANDRA-10205)
 
diff --git a/bin/cqlsh.py b/bin/cqlsh.py
index 56b709f9a4..2f05c2a656 100644
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@ -1167,6 +1167,9 @@ class Shell(cmd.Cmd):
                     trace = future.get_query_trace(self.max_trace_wait)
                     if trace:
                         print_trace(self, trace)
+                    elif stmt.trace_id:
+                        self.writeresult("This statement trace may be incomplete", color=RED)
+                        self.show_session(stmt.trace_id)
                     else:
                         msg = "Statement trace did not complete within %d seconds" % (self.session.max_trace_wait)
                         self.writeresult(msg, color=RED)