diff --git a/ChangeLog b/ChangeLog
index 3f46e2721..c23b42574 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -76,6 +76,7 @@
           Tomas Babej).
 - TW-1636 UUID with numeric-only first segment is not parsed properly (thanks
           to Tomas Babej).
+- TW-1638 Undo doesn't work when a context is set (thanks to Jeremy John Reeder).
 - Prevent potential task duplication during import for non-pending tasks.
 - Show the active context in "context list", if any is active.
 - Fix "task edit" dropping annotation text after newlines.
diff --git a/src/CLI2.cpp b/src/CLI2.cpp
index a1fb95eab..3f5abf84c 100644
--- a/src/CLI2.cpp
+++ b/src/CLI2.cpp
@@ -570,6 +570,11 @@ void CLI2::addContextFilter ()
     return;
   }
 
+  // The 'undo' command does not apply context.
+  auto cmd = getCommand ();
+  if (cmd == "undo")
+    return;
+
 /*
   // Detect if UUID or ID is set, and bail out
   for (auto& a : _args)