diff --git a/edmond/plugin.py b/edmond/plugin.py
index e9c0e9a..101f85b 100644
--- a/edmond/plugin.py
+++ b/edmond/plugin.py
@@ -100,8 +100,13 @@ class Plugin:
         question = message[len(words[0]):].strip()
         for q in self.config.get("questions", []):
             if question.startswith(q):
-                self.question = Question(q, question[len(q):].strip())
-                self.bot.log_d(f"Answering question from plugin {self.name}.")
+                content = question[len(q):].strip()
+                content = content.rstrip("?").rstrip()
+                question = Question(q, content)
+                self.question = question
+                self.bot.log_d(
+                    f"Answering question from plugin {self.name}: {question}"
+                )
                 return True
         return False