diff --git a/common/repositories/grid_entries_repository.h b/common/repositories/grid_entries_repository.h
index 8be3c6ae0..bdae0a518 100644
--- a/common/repositories/grid_entries_repository.h
+++ b/common/repositories/grid_entries_repository.h
@@ -103,7 +103,7 @@ public:
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
-				"SELECT MAX(`number`) FROM `{}` WHERE `zoneid` = {} AND `gridid` = {}",
+				"SELECT COALESCE(MAX(`number`), 0) FROM `{}` WHERE `zoneid` = {} AND `gridid` = {}",
 				TableName(),
 				zone_id,
 				grid_id