diff --git a/query/query_impl.go b/query/query_impl.go
index 8faba3443944e06b7391ddb30989013cc9ff1441..dd554e74331c5c5a8b86efb66298b288ac95501e 100644
--- a/query/query_impl.go
+++ b/query/query_impl.go
@@ -129,12 +129,10 @@ func NaiveQueryApply(q Query, qr Results) Results {
 			}
 			prefix = path.Clean(prefix)
 		}
-		// If the prefix isn't "/", end it in a "/" so we only find keys
-		// _under_ the prefix.
+		// If the prefix is empty, ignore it.
 		if prefix != "/" {
-			prefix += "/"
+			qr = NaiveFilter(qr, FilterKeyPrefix{prefix + "/"})
 		}
-		qr = NaiveFilter(qr, FilterKeyPrefix{prefix})
 	}
 	for _, f := range q.Filters {
 		qr = NaiveFilter(qr, f)