diff --git a/main.go b/main.go
index daca0014..c867fb7b 100644
--- a/main.go
+++ b/main.go
@@ -42,7 +42,6 @@ func start(cfg *config.Config) {
 
 func stop() {
 	watchdog.Shutdown()
-	storage.Get().Close()
 	controller.Shutdown()
 }
 
diff --git a/storage/storage_test.go b/storage/storage_test.go
index b2cda4dc..78834af6 100644
--- a/storage/storage_test.go
+++ b/storage/storage_test.go
@@ -72,7 +72,6 @@ func TestInitialize(t *testing.T) {
 				return
 			}
 			provider.Close()
-			provider = nil
 		})
 	}
 }