diff --git a/server/boards/integrationtests/clienttestlib.go b/server/boards/integrationtests/clienttestlib.go
index ad11791367..10997b0b18 100644
--- a/server/boards/integrationtests/clienttestlib.go
+++ b/server/boards/integrationtests/clienttestlib.go
@@ -388,6 +388,11 @@ func (th *TestHelper) TearDown() {
 		panic(err)
 	}
 
+	err = th.Server.Store().Shutdown()
+	if err != nil {
+		panic(err)
+	}
+
 	os.RemoveAll(th.Server.Config().FilesPath)
 
 	if err := os.Remove(th.Server.Config().DBConfigString); err == nil {
diff --git a/server/boards/server/server.go b/server/boards/server/server.go
index 9a364d25c9..d79f30129b 100644
--- a/server/boards/server/server.go
+++ b/server/boards/server/server.go
@@ -355,7 +355,7 @@ func (s *Server) Shutdown() error {
 
 	defer s.logger.Info("Server.Shutdown")
 
-	return s.store.Shutdown()
+	return nil
 }
 
 func (s *Server) Config() *config.Configuration {