diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000000..549704e761
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,9 @@
+{
+    "rust-analyzer.cargo.noDefaultFeatures": true,
+    "rust-analyzer.cargo.features": [
+        "test-blockchains",
+        "test-rpc",
+        // "compact_filters",
+        "verify",
+    ]
+}
diff --git a/src/blockchain/script_sync.rs b/src/blockchain/script_sync.rs
index 2c4b26cef9..e1182ad7c1 100644
--- a/src/blockchain/script_sync.rs
+++ b/src/blockchain/script_sync.rs
@@ -131,8 +131,9 @@ impl<'a, D: BatchDatabase> ScriptReq<'a, D> {
         let current_gap = self.script_index - last;
 
         // this is a hack to check whether the scripts are coming from a derivable descriptor
-        // we assume for non-derivable descriptors, the initial script count is always 1
-        let is_derivable = self.initial_scripts_needed > 1;
+        // we assume for non-derivable descriptors, the initial script count is always 1 and
+        // as we are working with (at-most) 2 descriptors, we use 2 to determine derivability
+        let is_derivable = self.initial_scripts_needed > 2;
 
         debug!(
             "sync: last={}, remaining={}, diff={}, stop_gap={}",