diff --git a/qt-ui/diveplanner.cpp b/qt-ui/diveplanner.cpp
index 4ca9a4938..2f55fd564 100644
--- a/qt-ui/diveplanner.cpp
+++ b/qt-ui/diveplanner.cpp
@@ -1404,6 +1404,7 @@ void DivePlannerPointsModel::cancelPlan()
 		free(stagingDive);
 	setPlanMode(NOTHING);
 	stagingDive = NULL;
+	diveplan.dp = NULL;
 	CylindersModel::instance()->setDive(current_dive);
 	CylindersModel::instance()->update();
 }