diff --git a/lua/aider.lua b/lua/aider.lua
index 38db0d1..72fcfe5 100644
--- a/lua/aider.lua
+++ b/lua/aider.lua
@@ -69,8 +69,13 @@ end
 
 function M.setup(config)
   M.config = config or {}
-  M.config.auto_manage_context = M.config.auto_manage_context or true
-  M.config.default_bindings = M.config.default_bindings or true
+  if M.config.auto_manage_context == nil then
+    M.config.auto_manage_context = true
+  end
+
+  if M.config.default_bindings == nil then
+    M.config.default_bindings = true
+  end
 
   vim.g.aider_buffer_sync = M.config.auto_manage_context