diff --git a/infinite/infinite.view.ts b/infinite/infinite.view.ts
index 6f3408d9a1e..929b3ac6fff 100644
--- a/infinite/infinite.view.ts
+++ b/infinite/infinite.view.ts
@@ -55,9 +55,9 @@ namespace $.$$ {
 			const ids = this.row_ids()
 			
 			return [
-				this.Before( ids.at(0) ),
+				this.Before( ids.at(0) ?? null ),
 				... ids.map( id => this.Row( id ) ),
-				this.After( ids.at(-1) ),
+				this.After( ids.at(-1) ?? null ),
 			]
 			
 		}