diff --git a/src/QBar/ControlSocket.hs b/src/QBar/ControlSocket.hs
index dae3a79e9eeab998e471fc1043fb1617a177619e..dc5b24d9b026a651d41866a4ee1cc39527642e2a 100644
--- a/src/QBar/ControlSocket.hs
+++ b/src/QBar/ControlSocket.hs
@@ -213,8 +213,7 @@ listenUnixSocket options@MainOptions{verbose} bar commandHandler = do
   socketExists <- doesFileExist socketPath
   when socketExists $ removeFile socketPath
   sock <- socket AF_UNIX Stream defaultProtocol
-  -- TODO: unsafe probably not what we want
-  setCloseOnExecIfNeeded =<< unsafeFdSocket sock
+  withFdSocket sock setCloseOnExecIfNeeded
   bind sock (SockAddrUnix socketPath)
   listen sock 5
   forever $ do