diff --git a/pcbnew/tools/drawing_tool.cpp b/pcbnew/tools/drawing_tool.cpp
index 9766f16c3c..c6fbc60598 100644
--- a/pcbnew/tools/drawing_tool.cpp
+++ b/pcbnew/tools/drawing_tool.cpp
@@ -989,6 +989,7 @@ int DRAWING_TOOL::DrawDimension( const TOOL_EVENT& aEvent )
 
             if( ++step >= FINISHED )
             {
+                dimension = nullptr;
                 step = SET_ORIGIN;
                 m_controls->SetAutoPan( false );
                 m_controls->CaptureCursor( false );