diff --git a/controllers/deviceController.js b/controllers/deviceController.js
index 9912562..a97342c 100644
--- a/controllers/deviceController.js
+++ b/controllers/deviceController.js
@@ -11,11 +11,15 @@ function index(req, res) {
       return res.json(device);
     });
   } else {
-    Device.get((err, devices) => {
+    Device.find({}, (err, devices) => {
       if (err) {
         logger.logError(`index: ${err}`);
         return res.status(500).send();
       }
+
+      if (devices.length === 0) {
+        return res.status(404).send();
+      }
       return res.json(devices);
     });
   }