diff --git a/src/apps/debugger/user_interface/gui/team_window/VariablesView.cpp b/src/apps/debugger/user_interface/gui/team_window/VariablesView.cpp
index 1c8455cfb2..78943fd7c5 100644
--- a/src/apps/debugger/user_interface/gui/team_window/VariablesView.cpp
+++ b/src/apps/debugger/user_interface/gui/team_window/VariablesView.cpp
@@ -354,9 +354,8 @@ private:
 private:
 	void _CompareValues()
 	{
-		if (fValue == NULL)
-			fValueChanged = false;
-		else {
+		fValueChanged = false;
+		if (fValue != NULL && fPreviousValue.Type() != 0) {
 			BVariant newValue;
 			fValue->ToVariant(newValue);
 			fValueChanged = (fPreviousValue != newValue);