diff --git a/client.go b/client.go
index 107d81d..b780aa9 100644
--- a/client.go
+++ b/client.go
@@ -416,12 +416,14 @@ func (c *Client) handleShell(channel ssh.Channel) {
 					c.SysMsg("Missing $FINGERPRINT from: /whitelist $FINGERPRINT")
 				} else {
 					fingerprint := parts[1]
-					err = c.Server.Whitelist(fingerprint)
-					if err != nil {
-						c.SysMsg("Error adding to whitelist: %s", err)
-					} else {
-						c.SysMsg("Added %s to the whitelist", fingerprint)
-					}
+					go func() {
+						err = c.Server.Whitelist(fingerprint)
+						if err != nil {
+							c.SysMsg("Error adding to whitelist: %s", err)
+						} else {
+							c.SysMsg("Added %s to the whitelist", fingerprint)
+						}
+					}()
 				}
 
 			default: