diff --git a/src/app/commands/cmd_undo_history.cpp b/src/app/commands/cmd_undo_history.cpp
index 24e5bd404..1f752e791 100644
--- a/src/app/commands/cmd_undo_history.cpp
+++ b/src/app/commands/cmd_undo_history.cpp
@@ -113,7 +113,7 @@ public:
           [[fallthrough]];
 
         case ui::kMouseMoveMessage:
-          if (hasCapture()) {
+          if (hasCapture() && m_undoHistory) {
             auto mouseMsg = static_cast<ui::MouseMessage*>(msg);
             const gfx::Rect bounds = this->bounds();