diff --git a/distribution/changelog.txt b/distribution/changelog.txt
index 812ffb8d98..587edd303b 100644
--- a/distribution/changelog.txt
+++ b/distribution/changelog.txt
@@ -6,6 +6,7 @@
 - Change: [#17499] Update error text when using vehicle incompatible with TD6 and add error when using incompatible track elements.
 - Fix: [#16476] The game sometimes crashes when demolishing a maze.
 - Fix: [#17444] “Manta Ray” boats slowed down too much in “Ayers Rock” scenario (original bug).
+- Fix: [#17503] Parks with staff with an ID of 0 have all staff windows focus on that staff
 
 0.4.1 (2022-07-04)
 ------------------------------------------------------------------------
diff --git a/src/openrct2-ui/windows/Staff.cpp b/src/openrct2-ui/windows/Staff.cpp
index b42637854e..ab08f493b9 100644
--- a/src/openrct2-ui/windows/Staff.cpp
+++ b/src/openrct2-ui/windows/Staff.cpp
@@ -1149,7 +1149,7 @@ private:
 
         if (viewport != nullptr)
         {
-            if (tempFocus == Focus(staff->sprite_index))
+            if (tempFocus == focus)
                 return;
 
             viewport_flags = viewport->flags;