diff --git a/rpc/api.go b/rpc/api.go
index 2b2467400..cd34934cf 100644
--- a/rpc/api.go
+++ b/rpc/api.go
@@ -320,12 +320,6 @@ func (p *EthereumApi) NewWhisperFilter(args *WhisperFilterArgs, reply *interface
 	return nil
 }
 
-func (p *EthereumApi) UninstallWhisperFilter(id int, reply *interface{}) error {
-	delete(p.messages, id)
-	*reply = true
-	return nil
-}
-
 func (self *EthereumApi) MessagesChanged(id int, reply *interface{}) error {
 	self.messagesMut.Lock()
 	defer self.messagesMut.Unlock()
@@ -725,7 +719,12 @@ func (p *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) error
 		if err := json.Unmarshal(req.Params, &args); err != nil {
 			return err
 		}
-		return p.UninstallWhisperFilter(args.Id, reply)
+
+		if _, ok := p.messages[args.Id]; ok {
+			delete(p.messages, args.Id)
+		}
+
+		*reply = true
 	case "shh_getFilterChanges":
 		args := new(FilterIdArgs)
 		if err := json.Unmarshal(req.Params, &args); err != nil {