diff --git a/src/apps/debugger/model/Image.cpp b/src/apps/debugger/model/Image.cpp
index 9e102b5fee..61269b5928 100644
--- a/src/apps/debugger/model/Image.cpp
+++ b/src/apps/debugger/model/Image.cpp
@@ -26,8 +26,11 @@ Image::Image(Team* team,const ImageInfo& imageInfo, LocatableFile* imageFile)
 
 Image::~Image()
 {
-	if (fDebugInfo != NULL)
+	if (fDebugInfo != NULL) {
+		if (fTeam != NULL)
+			fTeam->DebugInfo()->RemoveImageDebugInfo(fDebugInfo);
 		fDebugInfo->ReleaseReference();
+	}
 	if (fImageFile != NULL)
 		fImageFile->ReleaseReference();
 }