diff --git a/src/datastore/src/filestore.js b/src/datastore/src/filestore.js
index d096313fa..1ff0bd7a3 100644
--- a/src/datastore/src/filestore.js
+++ b/src/datastore/src/filestore.js
@@ -75,7 +75,11 @@ class FileStore extends NetworkStore {
    * });
    */
   find(query, options = {}) {
-    options.query = options.query || {};
+    // Set defaults for options
+    options = assign({
+      query: {},
+      tls: true
+    }, options);
     options.query.tls = options.tls === true;
 
     if (isNumber(options.ttl)) {