diff --git a/server/grpc_test.go b/server/grpc_test.go
index e2ecae03f..782063859 100644
--- a/server/grpc_test.go
+++ b/server/grpc_test.go
@@ -1007,6 +1007,10 @@ func TestQuerySQLWithError(t *testing.T) {
 			sql: "select _id, age, field_not_found from grouper",
 			err: pilosa.ErrFieldNotFound,
 		},
+		{
+			sql: "select age, color, count(*) from grouper group by field_not_found, age, color",
+			err: pilosa.ErrFieldNotFound,
+		},
 	}
 
 	for i, test := range tests {
diff --git a/sql/select.go b/sql/select.go
index d7afc2eec..2682a5349 100644
--- a/sql/select.go
+++ b/sql/select.go
@@ -598,8 +598,7 @@ func (h handlerSelectGroupBy) Apply(stmt *sqlparser.Select, qm QueryMask, indexF
 
 	rowsQueries := []string{}
 	for _, fieldName := range groupByFieldNames {
-		field := index.Field(fieldName)
-		rowsQueries = append(rowsQueries, Rows(field.Name()))
+		rowsQueries = append(rowsQueries, Rows(fieldName))
 	}
 
 	var wherePQL string