diff --git a/src/oldloader.cpp b/src/oldloader.cpp
index d69bccc0ab..32dcd3b76a 100644
--- a/src/oldloader.cpp
+++ b/src/oldloader.cpp
@@ -1664,7 +1664,13 @@ static bool LoadOldMain(LoadgameState *ls)
 				 * clear it for ourselves and let OTTD's rebuild PBS itself */
 				_m[i].m4 &= 0xF; /* Only keep the lower four bits; upper four is PBS */
 				break;
-			default: break;
+
+			case MP_WATER:
+				if (GetWaterClass(i) == 3) MakeRiver(i, Random());
+				break;
+
+			default:
+				break;
 		}
 	}
 
diff --git a/src/openttd.cpp b/src/openttd.cpp
index ecba066fad..8779f87d42 100644
--- a/src/openttd.cpp
+++ b/src/openttd.cpp
@@ -2425,9 +2425,7 @@ bool AfterLoadGame()
 
 			/* Move river flag and update canals to use water class */
 			if (IsTileType(t, MP_WATER)) {
-				if (_m[t].m5 == 2) {
-					MakeRiver(t, Random());
-				} else {
+				if (GetWaterClass(t) != WATER_CLASS_RIVER) {
 					if (IsWater(t)) {
 						Owner o = GetTileOwner(t);
 						if (o == OWNER_WATER) {