diff --git a/go/libraries/doltcore/sqle/index/prolly_fields.go b/go/libraries/doltcore/sqle/index/prolly_fields.go
index fb2ff9c4a0..c4507f82b3 100644
--- a/go/libraries/doltcore/sqle/index/prolly_fields.go
+++ b/go/libraries/doltcore/sqle/index/prolly_fields.go
@@ -217,6 +217,9 @@ func PutField(ctx context.Context, ns tree.NodeStore, tb *val.TupleBuilder, i in
 	case val.CommitAddrEnc:
 		tb.PutCommitAddr(i, v.(hash.Hash))
 	case val.CellEnc:
+		if _, ok := v.([]byte); ok {
+			v = deserializeGeometry(v.([]byte))
+		}
 		tb.PutCell(i, ZCell(v.(types.GeometryValue)))
 	default:
 		panic(fmt.Sprintf("unknown encoding %v %v", enc, v))
diff --git a/go/libraries/doltcore/table/editor/creation/index.go b/go/libraries/doltcore/table/editor/creation/index.go
index 55a39ff637..97ceb00d60 100644
--- a/go/libraries/doltcore/table/editor/creation/index.go
+++ b/go/libraries/doltcore/table/editor/creation/index.go
@@ -18,6 +18,7 @@ import (
 	"bytes"
 	"context"
 	"fmt"
+	"github.com/dolthub/dolt/go/libraries/doltcore/sqle/index"
 	"io"
 	"strings"
 
@@ -211,7 +212,7 @@ func BuildSecondaryProllyIndex(ctx context.Context, vrw types.ValueReadWriter, n
 				keyBld.PutRaw(to, k.GetField(from))
 			} else {
 				from -= pkLen
-				keyBld.PutRaw(to, v.GetField(from))
+				index.PutField(ctx, ns, keyBld, to, v.GetField(from))
 			}
 		}