diff --git a/src/map.cpp b/src/map.cpp
index ce69accb5..213844d57 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -102,7 +102,7 @@ MapSector * Map::getSectorNoGenerateNoLock(v2s16 p)
 		return sector;
 	}
 
-	std::map<v2s16, MapSector*>::iterator n = m_sectors.find(p);
+	auto n = m_sectors.find(p);
 
 	if (n == m_sectors.end())
 		return NULL;
diff --git a/src/map.h b/src/map.h
index 1e5499586..931764215 100644
--- a/src/map.h
+++ b/src/map.h
@@ -266,7 +266,7 @@ protected:
 
 	std::set<MapEventReceiver*> m_event_receivers;
 
-	std::map<v2s16, MapSector*> m_sectors;
+	std::unordered_map<v2s16, MapSector*> m_sectors;
 
 	// Be sure to set this to NULL when the cached sector is deleted
 	MapSector *m_sector_cache = nullptr;