diff --git a/Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.h b/Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.h
index 50d3fb817..154ba4915 100644
--- a/Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.h
+++ b/Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.h
@@ -223,7 +223,7 @@ typedef enum : NSUInteger {
 
  @param htmlString the HTLM string to render.
  @param event the event associated to the string.
- @param roomState the room state right before the event.
+ @param roomState the room state right before the event. If nil, replies will not get constructed or formatted.
  @return an attributed string.
  */
 - (NSAttributedString*)renderHTMLString:(NSString*)htmlString forEvent:(MXEvent*)event withRoomState:(MXRoomState*)roomState;
diff --git a/changelog.d/pr-6251.bugfix b/changelog.d/pr-6251.bugfix
new file mode 100644
index 000000000..c8907373b
--- /dev/null
+++ b/changelog.d/pr-6251.bugfix
@@ -0,0 +1 @@
+Remove render edit flag and fix a nil room state crash