diff --git a/aider_gitea/__init__.py b/aider_gitea/__init__.py
index 4f356a5..9ce207f 100644
--- a/aider_gitea/__init__.py
+++ b/aider_gitea/__init__.py
@@ -517,16 +517,6 @@ def solve_issues_in_repository(
             )
 
         if issue_resolution.success:
-            # Handle unresolved pull request comments
-            handle_pr_comments(
-                repository_config,
-                issue_resolution.pull_request_id,
-                branch_name,
-                Path(repository_path),
-                client,
-                seen_issues_db,
-                issue_url,
-            )
             seen_issues_db.mark_as_seen(issue_url, str(issue_number))
             seen_issues_db.update_pr_info(
                 issue_url,
@@ -538,6 +528,16 @@ def solve_issues_in_repository(
                 issue_resolution.pull_request_id,
                 issue_number,
             )
+            # Handle unresolved pull request comments
+            handle_pr_comments(
+                repository_config,
+                issue_resolution.pull_request_id,
+                branch_name,
+                Path(repository_path),
+                client,
+                seen_issues_db,
+                issue_url,
+            )
 
 
 def handle_pr_comments(