diff --git a/syncmonitor/environment.py b/syncmonitor/environment.py
index 54244fb3acda9371737dd990ac8382e3ddb7afce..34d0a15915408915766a0a0e9e802bdcaa069fcf 100644
--- a/syncmonitor/environment.py
+++ b/syncmonitor/environment.py
@@ -89,6 +89,9 @@ class Provider:
         self.cookie = SyncreplCookie(cookie)
         self.mode = mode
 
+        if self.scope == ldap0.SCOPE_BASE and not searchbase:
+            self.scope = ldap0.SCOPE_SUBTREE
+
         self.behind = Watchdog(30)
         self.behind.triggered.connect(self._no_progress)
 
@@ -108,7 +111,7 @@ class Provider:
         control = ldap0.controls.syncrepl.SyncRequestControl(
             cookie=self.cookie, mode=self.mode)
 
-        self.search = self.client.search(self.base, scope=self.scope,
+        self.search = self.client.search(self.base, scope=self.scope, filterstr="(|)",
                 req_ctrls=[control])
         self.observer = SyncreplObserver(self.search, self.cookie)