diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/context/Context.java b/api/src/main/java/com/bartlomiejpluta/base/api/game/context/Context.java
index 1d448db2..1eb90a33 100644
--- a/api/src/main/java/com/bartlomiejpluta/base/api/game/context/Context.java
+++ b/api/src/main/java/com/bartlomiejpluta/base/api/game/context/Context.java
@@ -24,6 +24,8 @@ public interface Context extends Updatable, Renderable, Disposable {
 
    void openMap(String mapUid);
 
+   void closeMap();
+
    Entity createEntity(String entitySetUid);
 
    Image getImage(String imageUid);
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/context/model/DefaultContext.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/context/model/DefaultContext.java
index 3b5bdf15..962b191d 100644
--- a/engine/src/main/java/com/bartlomiejpluta/base/engine/context/model/DefaultContext.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/context/model/DefaultContext.java
@@ -88,12 +88,20 @@ public class DefaultContext implements Context {
    @SneakyThrows
    @Override
    public void openMap(@NonNull String mapUid) {
+      log.info("Opening map with UID: [{}]", mapUid);
       map = mapManager.loadObject(mapUid);
       mapHandler = mapManager.loadHandler(this, mapUid);
 
       mapHandler.onOpen(this, map);
    }
 
+   @Override
+   public void closeMap() {
+      log.info("Closing map");
+      map = null;
+      mapHandler = null;
+   }
+
    @Override
    public Entity createEntity(@NonNull String entitySetUid) {
       log.info("Creating new entity with UID: [{}]", entitySetUid);