diff --git a/cmd/lncli/commands.go b/cmd/lncli/commands.go
index 80601d4c6..b25e0258d 100644
--- a/cmd/lncli/commands.go
+++ b/cmd/lncli/commands.go
@@ -101,7 +101,10 @@ func actionDecorator(f func(*cli.Context) error) func(*cli.Context) error {
 			// two commands.
 			if s.Code() == codes.Unimplemented &&
 				(c.Command.Name == "create" ||
-					c.Command.Name == "unlock") {
+					c.Command.Name == "unlock" || 
+					c.Command.Name == "changepassword" ||
+					c.Command.Name == "createwatchonly") {
+					
 				return fmt.Errorf("Wallet is already unlocked")
 			}