diff --git a/CHANGELOG.md b/CHANGELOG.md
index 84a5f21..6c19265 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## Unreleased
+
+### Fixed
+
+- Fixed a bug where replying to a comment would instead reply to the parent of that comment
+- Fixed a bug where comments would be displayed as a grey block
+
 ## v0.2.0 - 2021-01-27
 
 ### Breaking changes
diff --git a/lib/widgets/comment.dart b/lib/widgets/comment.dart
index 12ab386..a48e66a 100644
--- a/lib/widgets/comment.dart
+++ b/lib/widgets/comment.dart
@@ -89,7 +89,7 @@ class CommentWidget extends HookWidget {
     final accStore = useAccountsStore();
 
     final isMine = commentTree.comment.comment.creatorId ==
-        accStore.defaultTokenFor(commentTree.comment.instanceHost).payload.id;
+        accStore.defaultTokenFor(commentTree.comment.instanceHost)?.payload?.id;
     final selectable = useState(false);
     final showRaw = useState(false);
     final collapsed = useState(false);
diff --git a/lib/widgets/write_comment.dart b/lib/widgets/write_comment.dart
index 74861ce..e52c3b3 100644
--- a/lib/widgets/write_comment.dart
+++ b/lib/widgets/write_comment.dart
@@ -62,7 +62,7 @@ class WriteComment extends HookWidget {
         final res = await api.run(CreateComment(
           content: controller.text,
           postId: post?.post?.id ?? comment.post.id,
-          parentId: comment?.recipient?.id,
+          parentId: comment?.comment?.id,
           auth: token.raw,
         ));
         Navigator.of(context).pop(res.commentView);