diff --git a/CMakeLists.txt b/CMakeLists.txt
index b5593130fb0..a898645e474 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -110,7 +110,7 @@ option(CLIENT "Compile client" ON)
 option(SERVER "Compile server" ON)
 option(TOOLS "Compile tools" OFF)
 option(DOWNLOAD_GTEST "Download and compile GTest" ${AUTO_DEPENDENCIES_DEFAULT})
-option(STEAM "Build the Steam release version" OFF)
+option(STEAM "Build the Steam release version" ON)
 option(DISCORD "Enable Discord rich presence support" OFF)
 option(DISCORD_DYNAMIC "Enable discovering Discord rich presence libraries at runtime (Linux only)" OFF)
 option(PREFER_BUNDLED_LIBS "Prefer bundled libraries over system libraries" ${AUTO_DEPENDENCIES_DEFAULT})
diff --git a/src/game/client/components/tclient/trails.cpp b/src/game/client/components/tclient/trails.cpp
index 1ceafcb6bf8..e32cdea3c6c 100644
--- a/src/game/client/components/tclient/trails.cpp
+++ b/src/game/client/components/tclient/trails.cpp
@@ -64,9 +64,14 @@ void CTrails::OnRender()
 	for(int ClientId = 0; ClientId < MAX_CLIENTS; ClientId++)
 	{
 		bool Local = m_pClient->m_Snap.m_LocalClientId == ClientId;
+
+		bool ZoomAllowed = GameClient()->m_Camera.ZoomAllowed();
 		if(!g_Config.m_ClTeeTrailOthers && !Local)
 			continue;
 
+		if(!Local && !ZoomAllowed)
+			continue;
+
 		if(!m_pClient->m_Snap.m_aCharacters[ClientId].m_Active)
 		{
 			if(m_HistoryValid[ClientId])