diff --git a/CRM/Report/Form.php b/CRM/Report/Form.php
index f3dbf456e87b..984f3eef915a 100644
--- a/CRM/Report/Form.php
+++ b/CRM/Report/Form.php
@@ -1403,7 +1403,7 @@ public function addToDeveloperTab($sql) {
     $this->sqlArray[] = $sql;
     foreach ($this->sqlArray as $sql) {
       foreach (array('LEFT JOIN') as $term) {
-        $sql = str_replace($term, '<br>&nbsp&nbsp' . $term, $sql);
+        $sql = str_replace($term, '<br>  ' . $term, $sql);
       }
       foreach (array('FROM', 'WHERE', 'GROUP BY', 'ORDER BY', 'LIMIT', ';') as $term) {
         $sql = str_replace($term, '<br><br>' . $term, $sql);
@@ -1411,6 +1411,8 @@ public function addToDeveloperTab($sql) {
       $this->sqlFormattedArray[] = $sql;
       $this->assign('sql', implode(';<br><br><br><br>', $this->sqlFormattedArray));
     }
+    $this->assign('sqlModes', $sqlModes = CRM_Utils_SQL::getSqlModes());
+
   }
 
   /**
diff --git a/templates/CRM/Report/Form/Tabs/Developer.tpl b/templates/CRM/Report/Form/Tabs/Developer.tpl
index dd2f3a195d2e..67e814ad53e9 100644
--- a/templates/CRM/Report/Form/Tabs/Developer.tpl
+++ b/templates/CRM/Report/Form/Tabs/Developer.tpl
@@ -1,4 +1,9 @@
 <div id="report-tab-set-developer" class="civireport-criteria">
-  <p><b>{ts}Class used{/ts}: {$report_class}</b></p>
+  <p><b>{ts}Class used{/ts}: {$report_class|escape}</b></p>
+  <p>{ts}SQL Modes{/ts}:
+  {foreach from=$sqlModes item=sqlMode}
+    {$sqlMode|escape}
+  {/foreach}
+  </p>
   <pre>{$sql|purify}</pre>
 </div>