diff --git a/bubble-server/src/main/java/bubble/resources/app/DataResourceBase.java b/bubble-server/src/main/java/bubble/resources/app/DataResourceBase.java
index d2b798c0..348e6776 100644
--- a/bubble-server/src/main/java/bubble/resources/app/DataResourceBase.java
+++ b/bubble-server/src/main/java/bubble/resources/app/DataResourceBase.java
@@ -108,9 +108,11 @@ public abstract class DataResourceBase extends AccountOwnedTemplateResource<AppD
         if (app == null) throw notFoundEx(request.getApp());
         request.setApp(app.getUuid());
 
-        final Device device = deviceDAO.findByAccountAndId(caller.getUuid(), request.getDevice());
-        if (device == null) throw notFoundEx(request.getDevice());
-        request.setDevice(device.getUuid());
+        if (request.hasDevice()) {
+            final Device device = deviceDAO.findByAccountAndId(caller.getUuid(), request.getDevice());
+            if (device == null) throw notFoundEx(request.getDevice());
+            request.setDevice(device.getUuid());
+        }
 
         final AppSite site = siteDAO.findByAccountAndId(caller.getUuid(), request.getSite());
         if (site == null) throw notFoundEx(request.getSite());