diff --git a/src/main.cpp b/src/main.cpp
index 679c66d65..442c530cb 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -107,6 +107,10 @@ int main(int argc, char* argv[]) {
       ret = client->main(argc, argv);
     } while (reload);
 
+    std::signal(SIGUSR1, SIG_IGN);
+    std::signal(SIGUSR2, SIG_IGN);
+    std::signal(SIGINT,  SIG_IGN);
+
     delete client;
     return ret;
   } catch (const std::exception& e) {
diff --git a/src/modules/hyprland/backend.cpp b/src/modules/hyprland/backend.cpp
index 77f534e0d..39341a14b 100644
--- a/src/modules/hyprland/backend.cpp
+++ b/src/modules/hyprland/backend.cpp
@@ -18,6 +18,9 @@ namespace waybar::modules::hyprland {
 std::filesystem::path IPC::socketFolder_;
 
 std::filesystem::path IPC::getSocketFolder(const char* instanceSig) {
+  static std::mutex folderMutex;
+  std::unique_lock lock(folderMutex);
+
   // socket path, specified by EventManager of Hyprland
   if (!socketFolder_.empty()) {
     return socketFolder_;