diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp
index 7b6d412da71..4c1ebe7a2c0 100644
--- a/Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp
+++ b/Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp
@@ -952,7 +952,7 @@ int CLuaElementDefs::GetElementsWithinRange(lua_State* luaVM)
 
         for (CClientEntity* entity : result)
         {
-            if (elementType.empty() || elementType == entity->GetTypeName())
+            if ((elementType.empty() || elementType == entity->GetTypeName()) && !entity->IsBeingDeleted())
             {
                 lua_pushnumber(luaVM, ++index);
                 lua_pushelement(luaVM, entity);
diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp
index 9c1b98ad1d2..9fbc3653d75 100644
--- a/Server/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp
+++ b/Server/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp
@@ -1010,7 +1010,7 @@ int CLuaElementDefs::getElementsWithinRange(lua_State* luaVM)
 
         for (CElement* entity : result)
         {
-            if (elementType.empty() || elementType == entity->GetTypeName())
+            if ((elementType.empty() || elementType == entity->GetTypeName()) && !entity->IsBeingDeleted())
             {
                 lua_pushnumber(luaVM, ++index);
                 lua_pushelement(luaVM, entity);