diff --git a/src/openrct2/windows/guest.c b/src/openrct2/windows/guest.c
index 72fc5d099d..e43ae453e6 100644
--- a/src/openrct2/windows/guest.c
+++ b/src/openrct2/windows/guest.c
@@ -719,7 +719,7 @@ void window_guest_viewport_init(rct_window* w){
     rct_peep* peep = GET_PEEP(w->number);
 
     if (peep->state == PEEP_STATE_PICKED){
-        focus.sprite.sprite_id = -1;
+        focus.sprite.sprite_id = SPR_NONE;
     }
     else{
         uint8 final_check = 1;
diff --git a/src/openrct2/windows/ride.c b/src/openrct2/windows/ride.c
index 8b61b0017c..93ffcf63f8 100644
--- a/src/openrct2/windows/ride.c
+++ b/src/openrct2/windows/ride.c
@@ -1777,7 +1777,7 @@ static void window_ride_init_viewport(rct_window *w)
     focus.coordinate.x = 0;
     focus.coordinate.y = 0;
     focus.coordinate.z = 0;
-    focus.sprite.sprite_id = -1;
+    focus.sprite.sprite_id = SPR_NONE;
     focus.coordinate.zoom = 0;
     focus.coordinate.rotation = get_current_rotation();
     focus.coordinate.width = 0;
diff --git a/src/openrct2/windows/staff.c b/src/openrct2/windows/staff.c
index d8bb201b57..fc094dc313 100644
--- a/src/openrct2/windows/staff.c
+++ b/src/openrct2/windows/staff.c
@@ -1220,7 +1220,7 @@ void window_staff_viewport_init(rct_window* w){
     rct_peep* peep = GET_PEEP(w->number);
 
     if (peep->state == PEEP_STATE_PICKED){
-        focus.sprite_id = -1;
+        focus.sprite_id = SPR_NONE;
     }
     else{
         focus.type |= VIEWPORT_FOCUS_TYPE_SPRITE | VIEWPORT_FOCUS_TYPE_COORDINATE;
diff --git a/src/openrct2/world/sprite.c b/src/openrct2/world/sprite.c
index 164173898b..fd37148e36 100644
--- a/src/openrct2/world/sprite.c
+++ b/src/openrct2/world/sprite.c
@@ -23,6 +23,7 @@
 #include "../OpenRCT2.h"
 #include "../rct2/addresses.h"
 #include "../scenario/scenario.h"
+#include "../sprites.h"
 #include "Fountain.h"
 #include "sprite.h"
 
@@ -166,7 +167,7 @@ void reset_sprite_list()
  */
 void reset_sprite_spatial_index()
 {
-    memset(gSpriteSpatialIndex, -1, sizeof(gSpriteSpatialIndex));
+    memset(gSpriteSpatialIndex, SPR_NONE, sizeof(gSpriteSpatialIndex));
     for (size_t i = 0; i < MAX_SPRITES; i++) {
         rct_sprite *spr = get_sprite(i);
         if (spr->unknown.sprite_identifier != SPRITE_IDENTIFIER_NULL) {