diff --git a/media/mediaType.go b/media/mediaType.go
index a35d80e3e94..cba26ed2b51 100644
--- a/media/mediaType.go
+++ b/media/mediaType.go
@@ -303,7 +303,7 @@ func (t Types) GetBySuffix(suffix string) (tp Type, si SuffixInfo, found bool) {
 }
 
 func (m Type) hasSuffix(suffix string) bool {
-	return strings.Contains(m.suffixesCSV, suffix)
+	return strings.Contains(","+m.suffixesCSV+",", ","+suffix+",")
 }
 
 // GetByMainSubType gets a media type given a main and a sub type e.g. "text" and "plain".
diff --git a/media/mediaType_test.go b/media/mediaType_test.go
index e44ab27ec6e..587d54e10a7 100644
--- a/media/mediaType_test.go
+++ b/media/mediaType_test.go
@@ -15,6 +15,7 @@ package media
 
 import (
 	"encoding/json"
+	"sort"
 	"testing"
 
 	qt "github.com/frankban/quicktest"
@@ -98,11 +99,28 @@ func TestBySuffix(t *testing.T) {
 
 func TestGetFirstBySuffix(t *testing.T) {
 	c := qt.New(t)
-	_, f, found := DefaultTypes.GetFirstBySuffix("xml")
-	c.Assert(found, qt.Equals, true)
-	c.Assert(f, qt.Equals, SuffixInfo{
-		Suffix:     "xml",
-		FullSuffix: ".xml"})
+
+	types := DefaultTypes
+
+	// Issue #8406
+	geoJSON := newMediaTypeWithMimeSuffix("application", "geo", "json", []string{"geojson", "gjson"})
+	types = append(types, geoJSON)
+	sort.Sort(types)
+
+	check := func(suffix string, expectedType Type) {
+		t, f, found := types.GetFirstBySuffix(suffix)
+		c.Assert(found, qt.Equals, true)
+		c.Assert(f, qt.Equals, SuffixInfo{
+			Suffix:     suffix,
+			FullSuffix: "." + suffix})
+		c.Assert(t, qt.Equals, expectedType)
+	}
+
+	check("js", JavascriptType)
+	check("json", JSONType)
+	check("geojson", geoJSON)
+	check("gjson", geoJSON)
+
 }
 
 func TestFromTypeString(t *testing.T) {