diff --git a/cicaprojekt/Stargate.java b/cicaprojekt/Stargate.java
index 97be703..7c36008 100644
--- a/cicaprojekt/Stargate.java
+++ b/cicaprojekt/Stargate.java
@@ -29,6 +29,12 @@ public class Stargate {
 
     public void setCurrentWall(Wall wall) {
         currentWall = wall;
+        if(wall != null) {
+            isSpawned = true;
+        }
+        else {
+            isSpawned = false;
+        }
     }
 
     public boolean isOpen() {
diff --git a/cicaprojekt/Wall.java b/cicaprojekt/Wall.java
index 5b47ce0..aa35936 100644
--- a/cicaprojekt/Wall.java
+++ b/cicaprojekt/Wall.java
@@ -8,14 +8,21 @@ public class Wall extends Tile {
     }
 
     public void spawnStargate(Stargate stargate, Direction direction) {
-        if (sg == null)
+        clearStargate();
+        if (sg == null) {
             sg = stargate;
+            sg.setCurrentWall(this);
+
+        }
         else
             return;
     }
 
     public void clearStargate() {
-        sg = null;
+        if(sg != null) {
+            sg.setCurrentWall(null);
+            sg = null;
+        }
     }
 
     public void onEntry(PlayerBase playerBase) {