diff --git a/src/actionshandler.cpp b/src/actionshandler.cpp
index 32d55c74a..a5ad8138e 100644
--- a/src/actionshandler.cpp
+++ b/src/actionshandler.cpp
@@ -139,6 +139,10 @@ void ActionsHandler::handleMessage()
 
     handledText = CustomEmojiModel::instance().preprocessText(handledText);
     handledText = markdownToHTML(handledText);
+    if (handledText.count("<p>") == 1 && handledText.count("</p>") == 1) {
+        handledText.remove("<p>");
+        handledText.remove("</p>");
+    }
 
     if (handledText.length() == 0) {
         return;