diff --git a/libraries/classes/Controllers/Server/ServerVariablesController.php b/libraries/classes/Controllers/Server/ServerVariablesController.php
index f0052b6acc..f548d3bb1b 100644
--- a/libraries/classes/Controllers/Server/ServerVariablesController.php
+++ b/libraries/classes/Controllers/Server/ServerVariablesController.php
@@ -344,6 +344,12 @@ class ServerVariablesController extends Controller
                 ? $this->variable_doc_links[$name] : null;
 
             list($formattedValue, $isHtmlFormatted) = $this->_formatVariable($name, $value);
+            if ($has_session_value) {
+                list($sessionFormattedValue, $sessionIsHtmlFormatted) = $this->_formatVariable(
+                    $name,
+                    $serverVarsSession[$name]
+                );
+            }
 
             $output .= $this->template->render('server/variables/variable_row', [
                 'row_class' => $row_class,
@@ -356,19 +362,10 @@ class ServerVariablesController extends Controller
                 'value' => $formattedValue,
                 'is_superuser' => $this->dbi->isSuperuser(),
                 'is_html_formatted' => $isHtmlFormatted,
+                'has_session_value' => $has_session_value,
+                'session_value' => isset($sessionFormattedValue)?$sessionFormattedValue:null,
+                'session_is_html_formated' => isset($sessionIsHtmlFormatted)?$sessionIsHtmlFormatted:null
             ]);
-
-            if ($has_session_value) {
-                list($formattedValue, $isHtmlFormatted) = $this->_formatVariable(
-                    $name,
-                    $serverVarsSession[$name]
-                );
-                $output .= $this->template->render('server/variables/session_variable_row', [
-                    'row_class' => $row_class,
-                    'value' => $formattedValue,
-                    'is_html_formatted' => $isHtmlFormatted,
-                ]);
-            }
         }
 
         return $output;
diff --git a/templates/server/variables/session_variable_row.twig b/templates/server/variables/session_variable_row.twig
deleted file mode 100644
index f6f286aff4..0000000000
--- a/templates/server/variables/session_variable_row.twig
+++ /dev/null
@@ -1,5 +0,0 @@
-<tr class="var-row {{ row_class }}" data-filter-row="{{ name | upper }}">
-    <td class="var-action"></td>
-    <td class="var-name session">({% trans 'Session value' %})</td>
-    <td class="var-value value">&nbsp;{{ value }}</td>
-</tr>
diff --git a/templates/server/variables/variable_row.twig b/templates/server/variables/variable_row.twig
index 174ac61be9..608850856d 100644
--- a/templates/server/variables/variable_row.twig
+++ b/templates/server/variables/variable_row.twig
@@ -27,3 +27,10 @@
     {% endif %}
     </td>
 </tr>
+{% if has_session_value %}
+    <tr class="var-row {{ row_class }}" data-filter-row="{{ name|upper }}">
+        <td class="var-action"></td>
+        <td class="var-name session">({% trans 'Session value' %})</td>
+        <td class="var-value value">&nbsp;{{ session_value }}</td>
+    </tr>
+{% endif %}