diff --git a/server.go b/server.go
index e259e808fc..068e977f21 100644
--- a/server.go
+++ b/server.go
@@ -425,8 +425,8 @@ func (s *Server) readConf() error {
 func (s *Server) Stop() {
 	s.send(&stopValue)
 	s.mutex.Lock()
+	defer s.mutex.Unlock()
 	s.log.close()
-	s.mutex.Unlock()
 }
 
 // Checks if the server is currently running.