diff --git a/src/dwarfs_main.cpp b/src/dwarfs_main.cpp
index 8e67d18da..49644e39d 100644
--- a/src/dwarfs_main.cpp
+++ b/src/dwarfs_main.cpp
@@ -830,16 +830,16 @@ void op_getxattr(fuse_req_t req, fuse_ino_t ino, char const* name,
         oss << "no performance monitor support\n";
 #endif
       }
-    } else {
-      if (name == inodeinfo_xattr) {
-        auto entry = userdata->fs.find(ino);
+    }
 
-        if (entry) {
-          auto ii = userdata->fs.get_inode_info(*entry);
-          oss << folly::toPrettyJson(ii) << "\n";
-        } else {
-          err = ENOENT;
-        }
+    if (name == inodeinfo_xattr) {
+      auto entry = userdata->fs.find(ino);
+
+      if (entry) {
+        auto ii = userdata->fs.get_inode_info(*entry);
+        oss << folly::toPrettyJson(ii) << "\n";
+      } else {
+        err = ENOENT;
       }
     }
 
@@ -899,10 +899,10 @@ void op_listxattr(fuse_req_t req, fuse_ino_t ino, size_t size) {
     if (ino == FUSE_ROOT_ID) {
       oss << pid_xattr << '\0';
       oss << perfmon_xattr << '\0';
-    } else {
-      oss << inodeinfo_xattr << '\0';
     }
 
+    oss << inodeinfo_xattr << '\0';
+
     auto xattrs = oss.view();
 
     LOG_TRACE << __func__ << ": xattrs.size=" << xattrs.size();