diff --git a/server/server.go b/server/server.go
index 4d2bfc7..d7c4525 100644
--- a/server/server.go
+++ b/server/server.go
@@ -67,8 +67,7 @@ func (s *server) handle(soc transport.Socket) {
 				break
 			}
 
-			//TODO: Fix potential race condition where the socket gets closed before this method sends the response
-			go s.handleRequest(&req, soc)
+			s.handleRequest(&req, soc)
 		}
 	}()
 }