diff --git a/gapis/resolve/resource_data.go b/gapis/resolve/resource_data.go
index 3547ebfc8..8f691291c 100644
--- a/gapis/resolve/resource_data.go
+++ b/gapis/resolve/resource_data.go
@@ -78,7 +78,7 @@ func buildResources(ctx context.Context, p *path.Command, t path.ResourceType, r
 		return nil, err
 	}
 	state := capture.NewUninitializedState(ctx).ReserveMemory(ranges)
-	var currentCmdIndex uint64
+	var currentCmdIndex uint64 = 0xffffffffffffffff
 	var currentCmdResourceCount int
 	idMap := api.ResourceMap{}
 
@@ -230,7 +230,7 @@ func ResourceExtras(ctx context.Context, p *path.ResourceExtras, r *path.Resolve
 		return nil, err
 	}
 
-	var currentCmdIndex uint64
+	var currentCmdIndex uint64 = 0xffffffffffffffff
 	var currentCmdResourceCount int
 	var resource api.Resource
 	state := capture.NewUninitializedState(ctx).ReserveMemory(ranges)
diff --git a/gapis/resolve/resources.go b/gapis/resolve/resources.go
index 0d8a9a0cf..b2b2a2c98 100644
--- a/gapis/resolve/resources.go
+++ b/gapis/resolve/resources.go
@@ -50,7 +50,7 @@ func (r *ResourcesResolvable) Resolve(ctx context.Context) (interface{}, error)
 	resourceTypes := map[string]path.ResourceType{}
 	seen := map[api.Resource]int{}
 
-	var currentCmdIndex uint64
+	var currentCmdIndex uint64 = 0xffffffffffffffff
 	var currentCmdResourceCount int
 	// If the capture contains initial state, build the necessary commands to recreate it.
 	initialCmds, ranges, err := initialcmds.InitialCommands(ctx, r.Capture)