diff --git a/header.php b/header.php
index 69557f7a..cf8fde0f 100644
--- a/header.php
+++ b/header.php
@@ -125,7 +125,7 @@
                                 <div class="col-xs-4 text-center">
                                     <a href="https://github.com/pi-hole/pi-hole/releases">Updates</a>
                                 </div>
-                                <div class="col-xs-12 text-center">Session is valid for <span id="sessiontimer"><?php if(strlen($pwhash) > 0){echo $maxlifetime;}else{echo "0";} ?></span></div>
+                                <div class="col-xs-12 text-center" id="sessiontimer">Session is valid for <span id="sessiontimercounter"><?php if(strlen($pwhash) > 0){echo $maxlifetime;}else{echo "0";} ?></span></div>
                             </li>
                             <!-- Menu Footer -->
                             <li class="user-footer">
diff --git a/js/pihole/footer.js b/js/pihole/footer.js
index 57950a21..8f3095f0 100644
--- a/js/pihole/footer.js
+++ b/js/pihole/footer.js
@@ -57,7 +57,7 @@ if(piholeVersion !== "vDev" && versionCompare(piholeVersion, "v2.7") < 0)
     alert("Pi-hole needs to be updated to at least v2.7 before you can use features such as whitelisting/blacklisting from this web interface!")
 
 // Session timer
-var sessionvalidity = parseInt(document.getElementById("sessiontimer").textContent);
+var sessionvalidity = parseInt(document.getElementById("sessiontimercounter").textContent);
 var start = new Date;
 
 function updateSessionTimer()
@@ -86,8 +86,12 @@ if(sessionvalidity > 0)
         if(seconds < 10) seconds = "0" + seconds;
 
         var currentTimeString = minutes + ":" + seconds;
-        document.getElementById("sessiontimer").textContent = currentTimeString;
+        document.getElementById("sessiontimercounter").textContent = currentTimeString;
 
         $('.timer').text(currentTimeString);
     }, 1000);
 }
+else
+{
+    document.getElementById("sessiontimer").style.display = 'none';
+}