diff --git a/src/node/db/API.js b/src/node/db/API.js
index 09cc95af..37fd3f16 100644
--- a/src/node/db/API.js
+++ b/src/node/db/API.js
@@ -431,7 +431,7 @@ exports.setPassword = function(padID, password, callback)
     if(ERR(err, callback)) return;
     
     //set the password
-    pad.setPassword(password);
+    pad.setPassword(password == "" ? null : password);
     
     callback();
   });