diff --git a/CHANGELOG b/CHANGELOG
index 2012b6f..9e8bfa5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,5 @@
 Don't display empty option for system messages in delete messages by name
+Don't show a kick button on your own session in the list of active sessions
 
 Version 1.20.6 - Jul. 23, 2016
 Simplify ignore logic + disallow ignoring chatters with higher status
diff --git a/chat.php b/chat.php
index f264b4e..8d45a2b 100644
--- a/chat.php
+++ b/chat.php
@@ -1059,8 +1059,13 @@ function send_sessions(){
 				echo "<td class=\"padded\">$temp[ip]</td>";
 			}
 			echo '<td class="padded">';
-			frmadm('sessions');
-			echo hidden('nick', $temp['nickname']).submit($I['kick']).'</form></td></tr>';
+			if($temp['nickname']!==$U['nickname']){
+				frmadm('sessions');
+				echo hidden('nick', $temp['nickname']).submit($I['kick']).'</form>';
+			}else{
+				echo '-';
+			}
+			echo '</td></tr>';
 		}else{
 			echo '<td class="padded">-</td>';
 			if($trackip){