diff --git a/configobject/history/history.go b/configobject/history/history.go
index cafb3d41..f8bdc72d 100644
--- a/configobject/history/history.go
+++ b/configobject/history/history.go
@@ -316,7 +316,11 @@ func commentHistoryWorker(super *supervisor.Supervisor) {
 			case "comment_add":
 				eventTime = values["entry_time"].(string)
 			case "comment_remove":
-				eventTime = values["remove_time"].(string)
+				if values["remove_time"] != nil {
+					eventTime = values["remove_time"].(string)
+				} else {
+					eventTime = values["expire_time"].(string)
+				}
 			}
 
 			data := []interface{}{