diff --git a/app/DataMapper/ClientSettings.php b/app/DataMapper/ClientSettings.php
index b079f3af6f..33ccfbea02 100644
--- a/app/DataMapper/ClientSettings.php
+++ b/app/DataMapper/ClientSettings.php
@@ -88,6 +88,9 @@ class ClientSettings extends BaseSettings
             return $company_settings;
         }
 
+        if(is_array($client_settings))
+            $client_settings = (object)$client_settings;
+
         foreach ($company_settings as $key => $value) {
             /* pseudo code
                 if the property exists and is a string BUT has no length, treat it as TRUE