diff --git a/FlippR-Driver/networking/FlippRServer.cpp b/FlippR-Driver/networking/FlippRServer.cpp
index 59d9dbd..b35f1e1 100644
--- a/FlippR-Driver/networking/FlippRServer.cpp
+++ b/FlippR-Driver/networking/FlippRServer.cpp
@@ -257,13 +257,7 @@ void FlippRServer::handle_help(const std::string& name, const std::string& value
 
 std::string FlippRServer::get_runtime_dir()
 {
-  char* runtime_dir = std::getenv("XDG_RUNTIME_DIR");
-  if(&runtime_dir == nullptr)
-  {
-    runtime_dir = DEFAULT_RUNTIME_DIR;
-  }
-
-  return runtime_dir;
+  return std::getenv("XDG_RUNTIME_DIR") ? std::getenv("XDG_RUNTIME_DIR") : DEFAULT_RUNTIME_DIR;
 }
 
 }