diff --git a/context.go b/context.go
index 737e4d7a..485e4598 100644
--- a/context.go
+++ b/context.go
@@ -1147,7 +1147,8 @@ func (c *Context) NegotiateFormat(offered ...string) string {
 			// According to RFC 2616 and RFC 2396, non-ASCII characters are not allowed in headers,
 			// therefore we can just iterate over the string without casting it into []rune
 			i := 0
-			for ; i < len(accepted); i++ {
+			minLen := min(len(accepted), len(offer))
+			for ; i < minLen; i++ {
 				if accepted[i] == '*' || offer[i] == '*' {
 					return offer
 				}
diff --git a/context_test.go b/context_test.go
index 85e0a616..44c7f2c6 100644
--- a/context_test.go
+++ b/context_test.go
@@ -1311,6 +1311,15 @@ func TestContextNegotiationFormatCustom(t *testing.T) {
 	assert.Equal(t, MIMEJSON, c.NegotiateFormat(MIMEJSON))
 }
 
+func TestContextNegotiationFormatWithShorterOfferLength(t *testing.T) {
+	c, _ := CreateTestContext(httptest.NewRecorder())
+	c.Request, _ = http.NewRequest("POST", "/", nil)
+	c.Request.Header.Add("Accept", "text/html")
+
+	assert.Equal(t, "", c.NegotiateFormat("text/htm"))
+	assert.Equal(t, "text/*", c.NegotiateFormat("text/*"))
+}
+
 func TestContextIsAborted(t *testing.T) {
 	c, _ := CreateTestContext(httptest.NewRecorder())
 	assert.False(t, c.IsAborted())