diff --git a/app/Model/AppModel.php b/app/Model/AppModel.php
index ab0f93e89..76fde818d 100644
--- a/app/Model/AppModel.php
+++ b/app/Model/AppModel.php
@@ -3072,7 +3072,7 @@ class AppModel extends Model
     protected function _findColumn($state, $query, $results = array())
     {
         if ($state === 'before') {
-            if (isset($query['fields']) && count($query['fields']) === 1) {
+            if (isset($query['fields']) && is_array($query['fields']) && count($query['fields']) === 1) {
                 if (strpos($query['fields'][0], '.') === false) {
                     $query['fields'][0] = $this->alias . '.' . $query['fields'][0];
                 }
diff --git a/app/Model/Server.php b/app/Model/Server.php
index 8cf8a6580..c3e9b63da 100644
--- a/app/Model/Server.php
+++ b/app/Model/Server.php
@@ -4586,11 +4586,11 @@ class Server extends AppModel
         $organisations = [];
         if ($user['Role']['perm_sharing_group'] || !Configure::read('Security.hide_organisation_index_from_users')) {
             $organisations = $this->Organisation->find('column', [
-                'fields' => 'name'
+                'fields' => ['name'],
             ]);
         }
         $tags = $this->Tag->find('column', [
-            'fields' => 'name'
+            'fields' => ['name'],
         ]);
         return [
             'organisations' => $organisations,