diff --git a/includes/database/query.inc b/includes/database/query.inc
index 7f3e9ff..d41b31d 100644
--- a/includes/database/query.inc
+++ b/includes/database/query.inc
@@ -368,7 +368,7 @@ abstract class Query implements QueryPlaceholderInterface {
    *   The called object.
    */
   public function comment($comment) {
-    $this->comments[] = $comment;
+    $this->comments[] = $this->filterComment($comment);
     return $this;
   }
 
@@ -390,6 +390,22 @@ abstract class Query implements QueryPlaceholderInterface {
   public function &getComments() {
     return $this->comments;
   }
+
+  /**
+   * Process a query comment string and ensure it does not include strings that
+   * might terminate the comment early.
+   *
+   * @param $string
+   *   The query comment string.
+   *
+   * @return
+   *   A cleaned up version of the query comment string.
+   */
+  private function filterComment($string = '') {
+    return preg_replace('/(\/\*\s*)|(\s\*\/)/', '', $string);
+  }
+}
+
 }
 
 /**