diff --git a/binaries/data/mods/public/gui/session/messages.js b/binaries/data/mods/public/gui/session/messages.js
index 5e508d4698..7f48bb2ce7 100644
--- a/binaries/data/mods/public/gui/session/messages.js
+++ b/binaries/data/mods/public/gui/session/messages.js
@@ -190,7 +190,7 @@ var g_NotificationsTypes =
 	{
 		g_DiplomacyDialog.onSpyResponse(notification, player);
 
-		if (notification.entity && g_ViewedPlayer == player)
+		if (notification.entity && g_ViewedPlayer == player && (!g_IsObserver || g_FollowPlayer))
 		{
 			g_DiplomacyDialog.close();
 			setCameraFollow(notification.entity);