diff --git a/cli/src/types.ts b/cli/src/types.ts
index 23c361e6e9..504a0986f4 100644
--- a/cli/src/types.ts
+++ b/cli/src/types.ts
@@ -293,6 +293,14 @@ export function getTypeStrFromPath(
   if (parsed.name === "folder.meta" || /^folder\.[^.]+\.meta$/.test(parsed.name)) {
     return "folder";
   }
+  // Match settings (base) or settings.<branch> (branch-specific)
+  if (parsed.name === "settings" || /^settings\.[^.]+$/.test(parsed.name)) {
+    return "settings";
+  }
+  // Match encryption_key (base) or encryption_key.<branch> (branch-specific)
+  if (parsed.name === "encryption_key" || /^encryption_key\.[^.]+$/.test(parsed.name)) {
+    return "encryption_key";
+  }
 
   const typeEnding = parsed.name.split(".").at(-1);
   if (