diff --git a/irc/server.go b/irc/server.go
index 7d27b885..2b9f0307 100644
--- a/irc/server.go
+++ b/irc/server.go
@@ -250,6 +250,10 @@ func (server *Server) Shutdown() {
 }
 
 func (server *Server) Run() {
+	// defer closing db/store
+	defer server.db.Close()
+	defer server.store.Close()
+
 	done := false
 	for !done {
 		select {