diff --git a/src/openbox.cc b/src/openbox.cc
index d17a5500..d95de520 100644
--- a/src/openbox.cc
+++ b/src/openbox.cc
@@ -265,10 +265,7 @@ void Openbox::addClient(Window window, OBClient *client)
 
 void Openbox::removeClient(Window window)
 {
-  _clients[window] = 0;
-  ClientMap::iterator it = _clients.find(window);
-  if (it != _clients.end())
-    _clients.erase(it);
+  _clients.erase(window);
 }