diff --git a/src/common/detectWMDE.c b/src/common/detectWMDE.c
index 0bb42bf17..e30909aa4 100644
--- a/src/common/detectWMDE.c
+++ b/src/common/detectWMDE.c
@@ -297,11 +297,8 @@ static void getSessionTypeFromEnv(FFWMDEResult* result)
     env = getenv("TERM");
     if(env != NULL && *env != '\0')
     {
-        if(strcasecmp(env, "linux") == 0)
-        {
-            ffStrbufSetS(&result->wmProtocolName, "TTY");
-            return;
-        }
+        ffStrbufSetS(&result->wmProtocolName, "TTY");
+        return;
     }
 }
 
diff --git a/src/modules/resolution.c b/src/modules/resolution.c
index 9a1375e46..2add70394 100644
--- a/src/modules/resolution.c
+++ b/src/modules/resolution.c
@@ -442,6 +442,9 @@ static void waylandGlobalAddListener(void* data, struct wl_registry* registry, u
 
 static bool printResolutionWaylandBackend(FFinstance* instance)
 {
+    if(getenv("XDG_RUNTIME_DIR") == NULL)
+        return false;
+
     const char* sessionType = getenv("XDG_SESSION_TYPE");
     if(sessionType != NULL && strcasecmp(sessionType, "wayland") != 0)
         return false;