diff --git a/scumm/resource.cpp b/scumm/resource.cpp
index 30d5eedef3f..f2ced4a8159 100644
--- a/scumm/resource.cpp
+++ b/scumm/resource.cpp
@@ -639,7 +639,7 @@ void ScummEngine::ensureResourceLoaded(int type, int i) {
 
 	debugC(DEBUG_RESOURCE, "ensureResourceLoaded(%s,%d)", resTypeFromId(type), i);
 
-	if ((type == rtRoom) && i > 0x7F && _version < 7) {
+	if ((type == rtRoom) && i > 0x7F && _version < 7 && _heversion <= 71) {
 		i = _resourceMapper[i & 0x7F];
 	}
 
@@ -666,7 +666,7 @@ void ScummEngine::ensureResourceLoaded(int type, int i) {
 	loadResource(type, i);
 
 	if (_version == 5 && type == rtRoom && i == _roomResource)
-			VAR(VAR_ROOM_FLAG) = 1;
+		VAR(VAR_ROOM_FLAG) = 1;
 }
 
 int ScummEngine::loadResource(int type, int idx) {