diff --git a/common/templates/context_funcs.go b/common/templates/context_funcs.go
index b574f7ae45..8ff0a790ce 100644
--- a/common/templates/context_funcs.go
+++ b/common/templates/context_funcs.go
@@ -1220,8 +1220,8 @@ func (c *Context) tmplOpenThread(cID int64) (string, error) {
 		return "", errors.New("unable to get thread")
 	}
 
-	if !thread.Type.IsThread() {
-		return "", errors.New("not a thread")
+	if thread.GuildID != c.GS.ID || !thread.Type.IsThread() {
+		return "", errors.New("not a valid thread")
 	}
 
 	falseVar := false