diff --git a/src/openrct2/game.c b/src/openrct2/game.c
index 9f50012b3e..5945aa0ba0 100644
--- a/src/openrct2/game.c
+++ b/src/openrct2/game.c
@@ -1124,6 +1124,9 @@ void game_fix_save_vars()
 
     // Fix gParkEntrance locations for which the map_element no longer exists
     fix_park_entrance_locations();
+
+    // Fix ride entrances that were moved without updating ride->entrances[]
+    fix_ride_entrance_locations();
 }
 
 void handle_park_load_failure_with_title_opt(const ParkLoadResult * result, const utf8 * path, bool loadTitleFirst)
diff --git a/src/openrct2/ride/ride.c b/src/openrct2/ride/ride.c
index f2e20bd48f..a94d72b284 100644
--- a/src/openrct2/ride/ride.c
+++ b/src/openrct2/ride/ride.c
@@ -8226,3 +8226,81 @@ LocationXY16 ride_get_rotated_coords(sint16 x, sint16 y, sint16 z)
 
     return rotatedCoords;
 }
+
+void fix_ride_entrance_locations()
+{
+    sint32 rideIndex;
+    Ride * ride;
+
+    FOR_ALL_RIDES(rideIndex, ride)
+    {
+        for (sint32 stationIndex = 0; stationIndex < MAX_STATIONS; stationIndex++)
+        {
+            LocationXY8 entranceLoc    = ride->entrances[stationIndex];
+            uint8       entranceHeight = ride->station_heights[stationIndex];
+
+            // Skip if the station has no entrance
+            if (entranceLoc.xy == RCT_XY8_UNDEFINED)
+            {
+                continue;
+            }
+
+            rct_map_element * mapElement = map_get_ride_entrance_element_at(entranceLoc.x * 32, entranceLoc.y * 32, entranceHeight, false);
+
+            if (mapElement != NULL && mapElement->properties.entrance.ride_index == rideIndex && map_element_get_station(mapElement) == stationIndex)
+            {
+                continue;
+            }
+
+            // At this point, we know we have a disconnected entrance.
+            // Search the map to find it. Skip the outer ring of invisible tiles.
+            bool alreadyFoundOne = false;
+            for (uint8 x = 1; x < MAXIMUM_MAP_SIZE_TECHNICAL - 1; x++)
+            {
+                for (uint8 y = 1; y < MAXIMUM_MAP_SIZE_TECHNICAL - 1; y++)
+                {
+                    mapElement = map_get_first_element_at(x, y);
+
+                    if (mapElement != NULL)
+                    {
+                        do
+                        {
+                            if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_ENTRANCE)
+                            {
+                                continue;
+                            }
+                            if (mapElement->properties.entrance.type != ENTRANCE_TYPE_RIDE_ENTRANCE)
+                            {
+                                continue;
+                            }
+                            if (mapElement->properties.entrance.ride_index != rideIndex)
+                            {
+                                continue;
+                            }
+                            if (map_element_get_station(mapElement) != stationIndex)
+                            {
+                                continue;
+                            }
+                            // There are some cases (like Belmont Shores), where there is both a sunk and a disconnected entrance.
+                            // Not sure why, but in this case, pick the highest one.
+                            if (alreadyFoundOne && ride->station_heights[stationIndex] > mapElement->base_height)
+                            {
+                                continue;
+                            }
+
+                            // Found our entrance
+                            ride->entrances[stationIndex].x = x;
+                            ride->entrances[stationIndex].y = y;
+                            ride->station_heights[stationIndex] = mapElement->base_height;
+
+                            alreadyFoundOne = true;
+
+                            log_info("Fixed disconnected entrance of ride %d, station %d to x = %d, y = %d and z = %d.", rideIndex, stationIndex, x, y, mapElement->base_height);
+                        }
+                        while (!map_element_is_last_for_tile(mapElement++));
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/src/openrct2/ride/ride.h b/src/openrct2/ride/ride.h
index 4b6d79ffb7..794f8ebfe0 100644
--- a/src/openrct2/ride/ride.h
+++ b/src/openrct2/ride/ride.h
@@ -1214,6 +1214,8 @@ void ride_stop_peeps_queuing(sint32 rideIndex);
 
 LocationXY16 ride_get_rotated_coords(sint16 x, sint16 y, sint16 z);
 
+void fix_ride_entrance_locations();
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/openrct2/world/map.c b/src/openrct2/world/map.c
index 6ce12209f6..a1c9a111ed 100644
--- a/src/openrct2/world/map.c
+++ b/src/openrct2/world/map.c
@@ -3832,6 +3832,30 @@ rct_map_element *map_get_park_entrance_element_at(sint32 x, sint32 y, sint32 z,
     return NULL;
 }
 
+rct_map_element * map_get_ride_entrance_element_at(sint32 x, sint32 y, sint32 z, bool ghost)
+{
+    rct_map_element * mapElement = map_get_first_element_at(x >> 5, y >> 5);
+    do
+    {
+        if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_ENTRANCE)
+            continue;
+
+        if (mapElement->base_height != z)
+            continue;
+
+        if (mapElement->properties.entrance.type != ENTRANCE_TYPE_RIDE_ENTRANCE)
+            continue;
+
+        if ((ghost == false) && (mapElement->flags & MAP_ELEMENT_FLAG_GHOST))
+            continue;
+
+        return mapElement;
+    }
+    while (!map_element_is_last_for_tile(mapElement++));
+
+    return NULL;
+}
+
 rct_map_element *map_get_small_scenery_element_at(sint32 x, sint32 y, sint32 z, sint32 type, uint8 quadrant)
 {
     rct_map_element *mapElement = map_get_first_element_at(x >> 5, y >> 5);
diff --git a/src/openrct2/world/map.h b/src/openrct2/world/map.h
index 1d110a9f32..7aaab7d8c2 100644
--- a/src/openrct2/world/map.h
+++ b/src/openrct2/world/map.h
@@ -415,6 +415,7 @@ rct_map_element* map_get_path_element_at(sint32 x, sint32 y, sint32 z);
 rct_map_element *map_get_wall_element_at(sint32 x, sint32 y, sint32 z, sint32 direction);
 rct_map_element *map_get_small_scenery_element_at(sint32 x, sint32 y, sint32 z, sint32 type, uint8 quadrant);
 rct_map_element *map_get_park_entrance_element_at(sint32 x, sint32 y, sint32 z, bool ghost);
+rct_map_element * map_get_ride_entrance_element_at(sint32 x, sint32 y, sint32 z, bool ghost);
 sint32 map_element_height(sint32 x, sint32 y);
 void sub_68B089();
 sint32 map_coord_is_connected(sint32 x, sint32 y, sint32 z, uint8 faceDirection);