diff --git a/lib/icingadb/icingadb-objects.cpp b/lib/icingadb/icingadb-objects.cpp
index e2272a63d..98a04162f 100644
--- a/lib/icingadb/icingadb-objects.cpp
+++ b/lib/icingadb/icingadb-objects.cpp
@@ -2022,7 +2022,7 @@ void IcingaDB::SendAddedComment(const Comment::Ptr& comment)
 
 void IcingaDB::SendRemovedComment(const Comment::Ptr& comment)
 {
-	if (!GetActive()) {
+	if (comment->GetEntryType() != CommentUser || !GetActive()) {
 		return;
 	}