diff --git a/mesa/agent.py b/mesa/agent.py
index 0b204c2255c..bbe9e944196 100644
--- a/mesa/agent.py
+++ b/mesa/agent.py
@@ -251,7 +251,8 @@ def do(
         Returns:
             AgentSet | list[Any]: The results of the method calls if return_results is True, otherwise the AgentSet itself.
         """
-        res = [getattr(agent, method_name)(*args, **kwargs) for agent in self._agents]
+        # we iterate over the actual weakref keys and check if weakref is alive before calling the method
+        res = [getattr(agent(), method_name)(*args, **kwargs) for agent in self._agents.keyrefs() if agent()]
 
         return res if return_results else self
 
diff --git a/tests/test_agent.py b/tests/test_agent.py
index 3cc8f9adc4e..484c18c94fd 100644
--- a/tests/test_agent.py
+++ b/tests/test_agent.py
@@ -11,6 +11,21 @@ def get_unique_identifier(self):
         return self.unique_id
 
 
+class TestAgentDo(Agent):
+
+    def __init__(self, unique_id, model,):
+        super().__init__(unique_id, model)
+        self.agent_set = None
+    def get_unique_identifier(self):
+        return self.unique_id
+
+    def do_add(self):
+        agent = TestAgentDo(self.model.next_id(), self.model)
+        self.agent_set.add(agent)
+
+    def do_remove(self):
+        self.agent_set.remove(self)
+
 def test_agent_removal():
     model = Model()
     agent = TestAgent(model.next_id(), model)
@@ -164,6 +179,31 @@ def test_agentset_do_method():
     with pytest.raises(AttributeError):
         agentset.do("non_existing_method")
 
+    # tests for addition and removal in do
+    # do iterates, so no error should be raised to change size while iterating
+    # related to issue #1595
+
+    #setup
+    n = 10
+    model = Model()
+    agents = [TestAgentDo(model.next_id(), model) for _ in range(n)]
+    agentset = AgentSet(agents, model)
+    for agent in agents:
+        agent.agent_set = agentset
+
+    agentset.do("do_add")
+    assert len(agentset) == 2 * n
+
+    #setup
+    model = Model()
+    agents = [TestAgentDo(model.next_id(), model) for _ in range(10)]
+    agentset = AgentSet(agents, model)
+    for agent in agents:
+        agent.agent_set = agentset
+
+    agentset.do("do_remove")
+    assert len(agentset) == 0
+
 
 def test_agentset_get_attribute():
     model = Model()