diff --git a/server/configuration.go b/server/configuration.go
index a9775c7..4021c50 100644
--- a/server/configuration.go
+++ b/server/configuration.go
@@ -53,7 +53,12 @@ func DefaultConfiguration() (cfg Configuration, err error) {
 	}
 	dataDir = path.Join(dataDir, appName)
 
-	runDir := path.Join(dataDir, "var")
+	runDir := os.Getenv("XDG_RUNTIME_DIR")
+	if len(runDir) == 0 {
+		runDir = path.Join(dataDir, "var")
+	} else {
+		runDir = path.Join(runDir, appName)
+	}
 
 	homeDir := os.Getenv("HOME")