diff --git a/playbooks/find_docker_enroll_portainer.yml b/playbooks/find_docker_enroll_portainer.yml
index 4d699c0..67d6d79 100644
--- a/playbooks/find_docker_enroll_portainer.yml
+++ b/playbooks/find_docker_enroll_portainer.yml
@@ -107,6 +107,12 @@
       changed_when: false
       failed_when: false
 
+    - name: Remove portainer_agent container if stuck in restart loop
+      community.docker.docker_container:
+        name: portainer_agent
+        state: absent
+      when: "'Restarting' in (agent_status.stdout | default(''))"
+
     - name: Pull Portainer Agent image
       community.docker.docker_image:
         name: portainer/agent