diff --git a/core/dive.h b/core/dive.h
index f6f610e52..f2dad1d56 100644
--- a/core/dive.h
+++ b/core/dive.h
@@ -115,7 +115,6 @@ extern bool autogroup;
 extern struct dive displayed_dive;
 extern unsigned int dc_number;
 extern struct dive *current_dive;
-#define current_dc (get_dive_dc(current_dive, dc_number))
 
 extern struct dive *get_dive(int nr);
 extern struct dive *get_dive_from_table(int nr, const struct dive_table *dt);
diff --git a/desktop-widgets/tab-widgets/TabDiveExtraInfo.cpp b/desktop-widgets/tab-widgets/TabDiveExtraInfo.cpp
index c078b7e40..d3e961f24 100644
--- a/desktop-widgets/tab-widgets/TabDiveExtraInfo.cpp
+++ b/desktop-widgets/tab-widgets/TabDiveExtraInfo.cpp
@@ -20,7 +20,9 @@ TabDiveExtraInfo::~TabDiveExtraInfo()
 
 void TabDiveExtraInfo::updateData()
 {
-	extraDataModel->updateDiveComputer(current_dc);
+	const struct divecomputer *currentdc = get_dive_dc(current_dive, dc_number);
+	if (currentdc)
+		extraDataModel->updateDiveComputer(currentdc);
 }
 
 void TabDiveExtraInfo::clear()
diff --git a/desktop-widgets/tab-widgets/TabDiveInformation.cpp b/desktop-widgets/tab-widgets/TabDiveInformation.cpp
index 0e34b3e81..663f29de2 100644
--- a/desktop-widgets/tab-widgets/TabDiveInformation.cpp
+++ b/desktop-widgets/tab-widgets/TabDiveInformation.cpp
@@ -181,9 +181,10 @@ int TabDiveInformation::updateSalinityComboIndex(int salinity)
 // If dive->user_salinity != dive->salinity (i.e. dc value) then show the salinity-overwrite indicator
 void TabDiveInformation::checkDcSalinityOverWritten()
 {
-	if (!current_dive)
+	const struct divecomputer *currentdc = get_dive_dc(current_dive, dc_number);
+	if (!current_dive || !currentdc)
 		return;
-	int dc_value = current_dc->salinity;
+	int dc_value = currentdc->salinity;
 	int user_value = current_dive->user_salinity;
 	bool show_indicator = false;
 	if (!manualDive && user_value != 0 && user_value != dc_value)
@@ -262,7 +263,10 @@ void TabDiveInformation::on_waterTypeCombo_activated(int index)
 {
 	Q_UNUSED(index)
 	int combobox_salinity = 0;
-	int dc_salinity = current_dc->salinity;
+	const struct divecomputer *currentdc = get_dive_dc(current_dive, dc_number);
+	if (!currentdc)
+		return;
+	int dc_salinity = currentdc->salinity;
 	switch(ui->waterTypeCombo->currentIndex()) {
 	case FRESHWATER:
 		combobox_salinity = FRESHWATER_SALINITY;