diff --git a/kv_store.hpp b/kv_store.hpp
index 302a49b..f1ccb5e 100644
--- a/kv_store.hpp
+++ b/kv_store.hpp
@@ -62,5 +62,5 @@ public:
 private:
 	std::unordered_map<string, string> data_;
 	mutable std::mutex mutex_;
-	string filename_ = "server_store.txt";
+	string filename_ = "store.txt";
 };
diff --git a/main.cpp b/main.cpp
index 84341c3..8f020b0 100644
--- a/main.cpp
+++ b/main.cpp
@@ -7,6 +7,8 @@ HttpServer* server = nullptr;
 void signal_handler(int sig) {
 	if (server) {
 		std::cout << "\nShutting down server...\n";
+		server->store.save();
+		server->sessions.save();
 		server->stop();
 	}
 }
diff --git a/session_store.hpp b/session_store.hpp
index 0b5783c..b369fd1 100644
--- a/session_store.hpp
+++ b/session_store.hpp
@@ -7,7 +7,9 @@
 
 class SessionStore {
 public:
-	SessionStore() : rng_(std::random_device{}()) {}
+	SessionStore() : rng_(std::random_device{}()) {
+		store_.set_file("sessions.txt");
+	}
 
 	std::string create() {
 		std::string id = generate_id();