diff --git a/src/Chat/Plugin/Admin.php b/src/Chat/Plugin/Admin.php
index fb6f2e0..e479ba5 100644
--- a/src/Chat/Plugin/Admin.php
+++ b/src/Chat/Plugin/Admin.php
@@ -39,6 +39,12 @@ private function validMessage(Message $message): bool {
     }
 
     private function execute(Message $message): \Generator {
+        if ($message->getParameters()[0] === "list") {
+            yield from $this->getList();
+
+            return;
+        }
+
         if (!yield from $this->storage->isAdmin($message->getMessage()->getUserId())) {
             yield from $this->chatClient->postMessage(
                 sprintf(":%d I'm sorry Dave, I'm afraid I can't do that", $message->getOrigin())
@@ -47,9 +53,7 @@ private function execute(Message $message): \Generator {
             return;
         }
 
-        if ($message->getParameters()[0] === "list") {
-            yield from $this->getList();
-        } elseif ($message->getParameters()[0] === "add") {
+        if ($message->getParameters()[0] === "add") {
             yield from $this->add((int) $message->getParameters()[1]);
         } elseif ($message->getParameters()[0] === "remove") {
             yield from $this->remove((int) $message->getParameters()[1]);