diff --git a/manage.cpp b/manage.cpp
index 6644d586d5..3524cb1250 100644
--- a/manage.cpp
+++ b/manage.cpp
@@ -50,12 +50,9 @@ bool Client::manage(xcb_window_t w, bool isMapped)
 {
     StackingUpdatesBlocker stacking_blocker(workspace());
 
-    grabXServer();
-
     Xcb::WindowAttributes attr(w);
     Xcb::WindowGeometry windowGeometry(w);
     if (attr.isNull() || windowGeometry.isNull()) {
-        ungrabXServer();
         return false;
     }
 
@@ -641,8 +638,6 @@ bool Client::manage(xcb_window_t w, bool isMapped)
 
     delete session;
 
-    ungrabXServer();
-
     client_rules.discardTemporary();
     applyWindowRules(); // Just in case
     RuleBook::self()->discardUsed(this, false);   // Remove ApplyNow rules