diff --git a/distribution/changelog.txt b/distribution/changelog.txt
index 343dd47c3d..b03f84823c 100644
--- a/distribution/changelog.txt
+++ b/distribution/changelog.txt
@@ -1,6 +1,7 @@
 0.4.1 (in development)
 ------------------------------------------------------------------------
 - Fix: [#16974] Small scenery ghosts can be deleted.
+- Fix: [#17005] Unable to set patrol area for first staff member in park.
 - Fix: [#17073] Corrupt ride window and random crashes when trains have more than 144 cars.
 - Improved: [#17050] Transparency can be enabled directly without needing see-through enabled first.
 - Removed: [#16864] Title sequence editor (replaced by plug-in).
diff --git a/src/openrct2-ui/windows/PatrolArea.cpp b/src/openrct2-ui/windows/PatrolArea.cpp
index cd8ade51fc..67a823ef50 100644
--- a/src/openrct2-ui/windows/PatrolArea.cpp
+++ b/src/openrct2-ui/windows/PatrolArea.cpp
@@ -299,5 +299,5 @@ rct_window* WindowPatrolAreaOpen(EntityId staffId)
 EntityId WindowPatrolAreaGetCurrentStaffId()
 {
     auto current = reinterpret_cast<PatrolAreaWindow*>(window_find_by_class(WC_PATROL_AREA));
-    return current != nullptr ? current->GetStaffId() : EntityId();
+    return current != nullptr ? current->GetStaffId() : EntityId::GetNull();
 }