diff --git a/source/friend/friend.cpp b/source/friend/friend.cpp
index a3d3bbc75..798d9a6ab 100644
--- a/source/friend/friend.cpp
+++ b/source/friend/friend.cpp
@@ -196,7 +196,14 @@ void CNpcFriend::init()
 	m_frame = 0;
 	m_reversed = false;
 	m_platform = NULL;
+
+	// Get rid of the bloody auto-talk-to-npc stuff except in cd builds..
+#if defined(__USER_CDBUILD__)
 	m_hasSpokenToSbYet=false;
+#else
+	m_hasSpokenToSbYet=true;
+#endif
+
 	m_iconStrobe=0;
 }