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 348e6776..aa8133e3 100644
--- a/bubble-server/src/main/java/bubble/resources/app/DataResourceBase.java
+++ b/bubble-server/src/main/java/bubble/resources/app/DataResourceBase.java
@@ -114,11 +114,11 @@ public abstract class DataResourceBase extends AccountOwnedTemplateResource<AppD
             request.setDevice(device.getUuid());
         }
 
-        final AppSite site = siteDAO.findByAccountAndId(caller.getUuid(), request.getSite());
+        final AppSite site = siteDAO.findByAccountAndAppAndId(caller.getUuid(), app.getUuid(), request.getSite());
         if (site == null) throw notFoundEx(request.getSite());
         request.setSite(site.getUuid());
 
-        final AppMatcher matcher = matcherDAO.findByAccountAndId(caller.getUuid(), request.getMatcher());
+        final AppMatcher matcher = matcherDAO.findByAccountAndAppAndId(caller.getUuid(), app.getUuid(), request.getMatcher());
         if (matcher == null) throw notFoundEx(request.getMatcher());
         request.setMatcher(matcher.getUuid());