diff --git a/src/tier1/convar.cpp b/src/tier1/convar.cpp
index f7cec1cf..cdf9e193 100644
--- a/src/tier1/convar.cpp
+++ b/src/tier1/convar.cpp
@@ -647,7 +647,9 @@ void ConVar::InternalSetValue(const char* value)
 		if (g_pCVar && !g_pCVar->IsMaterialThreadSetAllowed())
 		{
 			g_pCVar->QueueMaterialThreadSetValue(this, value);
-			return;
+
+			if (!IsFlagSet(FCVAR_STUDIO_SYSTEM))
+				return;
 		}
 	}