diff --git a/lib/icinga/comment.cpp b/lib/icinga/comment.cpp
index af7b2f16a..90944b913 100644
--- a/lib/icinga/comment.cpp
+++ b/lib/icinga/comment.cpp
@@ -214,6 +214,9 @@ void Comment::RemoveComment(const String& id, const MessageOrigin::Ptr& origin)
 	Log(LogNotice, "Comment")
 	    << "Removed comment '" << comment->GetName() << "' from object '" << comment->GetCheckable()->GetName() << "'.";
 
+	if (comment->GetPackage() != "_api")
+		return;
+
 	Array::Ptr errors = new Array();
 
 	if (!ConfigObjectUtility::DeleteObject(comment, false, errors)) {