diff --git a/app/Model/OrgBlocklist.php b/app/Model/OrgBlocklist.php
index ba9c706e7..9ab835271 100644
--- a/app/Model/OrgBlocklist.php
+++ b/app/Model/OrgBlocklist.php
@@ -1,5 +1,6 @@
 <?php
 App::uses('AppModel', 'Model');
+
 class OrgBlocklist extends AppModel
 {
     public $useTable = 'org_blocklists';
@@ -39,4 +40,24 @@ class OrgBlocklist extends AppModel
         }
         return true;
     }
+
+    /**
+     * @param array $eventArray
+     */
+    public function removeBlockedEvents(array &$eventArray)
+    {
+        $blocklistHits = $this->find('column', array(
+            'conditions' => array('OrgBlocklist.org_uuid' => array_unique(array_column($eventArray, 'orgc_uuid'))),
+            'fields' => array('OrgBlocklist.org_uuid'),
+        ));
+        if (empty($blocklistHits)) {
+            return;
+        }
+        $blocklistHits = array_flip($blocklistHits);
+        foreach ($eventArray as $k => $event) {
+            if (isset($blocklistHits[$event['orgc_uuid']])) {
+                unset($eventArray[$k]);
+            }
+        }
+    }
 }
diff --git a/app/Model/Server.php b/app/Model/Server.php
index 7428b21c4..3fddb420c 100644
--- a/app/Model/Server.php
+++ b/app/Model/Server.php
@@ -733,7 +733,7 @@ class Server extends AppModel
     public function getEventIdsFromServer(ServerSyncTool $serverSync, $all = false, $ignoreFilterRules = false, $scope = 'events', $force = false)
     {
         if (!in_array($scope, ['events', 'sightings'], true)) {
-            throw new InvalidArgumentException("Scope mus be 'events' or 'sightings', '$scope' given.");
+            throw new InvalidArgumentException("Scope must be 'events' or 'sightings', '$scope' given.");
         }
 
         $eventArray = $this->getEventIndexFromServer($serverSync, $ignoreFilterRules);
@@ -767,16 +767,7 @@ class Server extends AppModel
 
             if (Configure::read('MISP.enableOrgBlocklisting') !== false) {
                 $this->OrgBlocklist = ClassRegistry::init('OrgBlocklist');
-                $blocklistHits = $this->OrgBlocklist->find('column', array(
-                    'conditions' => array('OrgBlocklist.org_uuid' => array_unique(array_column($eventArray, 'orgc_uuid'))),
-                    'fields' => array('OrgBlocklist.org_uuid'),
-                ));
-                $blocklistHits = array_flip($blocklistHits);
-                foreach ($eventArray as $k => $event) {
-                    if (isset($blocklistHits[$event['orgc_uuid']])) {
-                        unset($eventArray[$k]);
-                    }
-                }
+                $this->OrgBlocklist->removeBlockedEvents($eventArray);
             }
 
             foreach ($eventArray as $k => $event) {