diff --git a/patchwork/common/client/scm.py b/patchwork/common/client/scm.py
index c0b6f47b4..33d7d6728 100644
--- a/patchwork/common/client/scm.py
+++ b/patchwork/common/client/scm.py
@@ -402,7 +402,7 @@ def reset_comments(self) -> None:
         for thread, comments in self.__iter_comments():
             comment_ids_to_delete = []
             for comment in comments:
-                if comment.content.startswith(_COMMENT_MARKER):
+                if comment.content is not None and comment.content.startswith(_COMMENT_MARKER):
                     comment_ids_to_delete.append(comment.id)
             if len(comment_ids_to_delete) == len(comments):
                 for comment_id in comment_ids_to_delete:
diff --git a/pyproject.toml b/pyproject.toml
index 4c9353170..9454cfb97 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "patchwork-cli"
-version = "0.0.86"
+version = "0.0.88"
 description = ""
 authors = ["patched.codes"]
 license = "AGPL"