4 files changed, 8 insertions, 8 deletions

diff --git a/server/controllers/api/v1/index.js b/server/controllers/api/v1/index.js
index abbc5eb60..b562bc2af 100644
--- a/server/controllers/api/v1/index.js
+++ b/server/controllers/api/v1/index.js
@@ -20,5 +20,5 @@ module.exports = router
 // ---------------------------------------------------------------------------
 
 function badRequest (req, res, next) {
-  res.sendStatus(400)
+  res.type('json').status(400).end()
 }
diff --git a/server/controllers/api/v1/pods.js b/server/controllers/api/v1/pods.js
index c93a86ee8..fa9832914 100644
--- a/server/controllers/api/v1/pods.js
+++ b/server/controllers/api/v1/pods.js
@@ -66,7 +66,7 @@ function makeFriends (req, res, next) {
   friends.makeFriends(function (err) {
     if (err) return next(err)
 
-    res.sendStatus(204)
+    res.type('json').status(204).end()
   })
 }
 
@@ -79,7 +79,7 @@ function removePods (req, res, next) {
       if (err) logger.error('Cannot remove all remote videos of %s.', url)
       else logger.info('%s pod removed.', url)
 
-      res.sendStatus(204)
+      res.type('json').status(204).end()
     })
   })
 }
@@ -88,6 +88,6 @@ function quitFriends (req, res, next) {
   friends.quitFriends(function (err) {
     if (err) return next(err)
 
-    res.sendStatus(204)
+    res.type('json').status(204).end()
   })
 }
diff --git a/server/controllers/api/v1/remoteVideos.js b/server/controllers/api/v1/remoteVideos.js
index 475a874cf..7622e39f5 100644
--- a/server/controllers/api/v1/remoteVideos.js
+++ b/server/controllers/api/v1/remoteVideos.js
@@ -48,6 +48,6 @@ function removeRemoteVideo (req, res, next) {
   videos.removeRemotesOfByMagnetUris(url, magnetUris, function (err) {
     if (err) return next(err)
 
-    res.sendStatus(204)
+    res.type('json').status(204).end()
   })
 }
diff --git a/server/controllers/api/v1/videos.js b/server/controllers/api/v1/videos.js
index 620711925..9398aabb7 100644
--- a/server/controllers/api/v1/videos.js
+++ b/server/controllers/api/v1/videos.js
@@ -77,7 +77,7 @@ function addVideo (req, res, next) {
       friends.addVideoToFriends(video_data)
 
       // TODO : include Location of the new video
-      res.sendStatus(201)
+      res.type('json').status(201).end()
     })
   })
 }
@@ -87,7 +87,7 @@ function getVideos (req, res, next) {
     if (err) return next(err)
 
     if (video === null) {
-      return res.sendStatus(404)
+      res.type('json').status(204).end()
     }
 
     res.json(video)
@@ -117,7 +117,7 @@ function removeVideo (req, res, next) {
         }
 
         friends.removeVideoToFriends(params)
-        res.sendStatus(204)
+        res.type('json').status(204).end()
       })
     })
   })