diff --git a/src/app/qgsundowidget.h b/src/app/qgsundowidget.h
index aa12c8515124..8c02251c55ca 100644
--- a/src/app/qgsundowidget.h
+++ b/src/app/qgsundowidget.h
@@ -25,6 +25,7 @@
 #include <QWidget>
 #include <QUndoView>
 #include <QUndoStack>
+#include <QPointer>
 
 #include "qgspanelwidget.h"
 #include "qgis_app.h"
@@ -93,7 +94,7 @@ class APP_EXPORT QgsUndoWidget : public QgsPanelWidget
 
   private:
     QUndoView *mUndoView = nullptr;
-    QUndoStack *mUndoStack = nullptr;
+    QPointer< QUndoStack > mUndoStack;
     QgsMapCanvas *mMapCanvas = nullptr;
 
     int mPreviousIndex = 0;