diff --git a/lib/API/JSON/Response.php b/lib/API/JSON/Response.php
index 8bb41da115..c20323012a 100644
--- a/lib/API/JSON/Response.php
+++ b/lib/API/JSON/Response.php
@@ -30,14 +30,13 @@ abstract class Response {
     if (!empty($this->meta)) {
       $response['meta'] = $this->meta;
     }
-    if ($data !== null) {
-      $response = array_merge($response, $data);
+    if ($data === null) {
+      $data = [];
     }
+    $response = array_merge($response, $data);
 
-    if (!empty($response)) {
-      @header('Content-Type: application/json; charset=' . get_option('blog_charset'));
-      echo WPFunctions::get()->wpJsonEncode($response);
-    }
+    @header('Content-Type: application/json; charset=' . get_option('blog_charset'));
+    echo WPFunctions::get()->wpJsonEncode($response);
     die();
   }
 
diff --git a/lib/API/JSON/SuccessResponse.php b/lib/API/JSON/SuccessResponse.php
index 6720e3d5e0..0e600e6def 100644
--- a/lib/API/JSON/SuccessResponse.php
+++ b/lib/API/JSON/SuccessResponse.php
@@ -11,7 +11,7 @@ class SuccessResponse extends Response {
   }
 
   public function getData() {
-    if ($this->data === null) return null;
+    if ($this->data === null) return [];
 
     return [
       'data' => $this->data,