diff --git a/config/func.inc.php b/config/func.inc.php
index 27e04032a..33a8e1640 100644
--- a/config/func.inc.php
+++ b/config/func.inc.php
@@ -154,7 +154,9 @@
     function executeQueryArray($query_id, $args = null) {
         $oDB = &DB::getInstance();
         $output = $oDB->executeQuery($query_id, $args);
-        if(!is_array($output->data)) $output->data = array($output->data);
+        if(!is_array($output->data) && count($output->data) > 0){
+			$output->data = array($output->data);
+		}
         return $output;
     }