diff --git a/src/Entries/Entry.php b/src/Entries/Entry.php index 406cd62d75a..1340ff4a70f 100644 --- a/src/Entries/Entry.php +++ b/src/Entries/Entry.php @@ -528,10 +528,13 @@ public function order() return $this->value('order'); } - return $this->structure()->in($this->locale()) + $order = $this->structure()->in($this->locale()) ->flattenedPages() ->map->reference() - ->flip()->get($this->id) + 1; + ->filter() + ->flip()->get($this->id); + + return $order !== null ? $order + 1 : null; } public function template($template = null)