diff --git a/crates/nu-command/tests/format_conversions/json.rs b/crates/nu-command/tests/format_conversions/json.rs
index 8da9024fc1..75a6ced766 100644
--- a/crates/nu-command/tests/format_conversions/json.rs
+++ b/crates/nu-command/tests/format_conversions/json.rs
@@ -98,3 +98,13 @@ fn table_to_json_text() {
         assert_eq!(actual.out, "JonAndrehudaTZ");
     })
 }
+
+#[test]
+fn top_level_values_from_json() {
+    for (value, type_name) in [("null", "nothing"), ("true", "bool"), ("false", "bool")] {
+        let actual = nu!(r#""{}" | from json | to json"#, value);
+        assert_eq!(actual.out, value);
+        let actual = nu!(r#""{}" | from json | describe"#, value);
+        assert_eq!(actual.out, type_name);
+    }
+}
diff --git a/crates/nu-json/src/util.rs b/crates/nu-json/src/util.rs
index 0d31e06a58..8fa35d429a 100644
--- a/crates/nu-json/src/util.rs
+++ b/crates/nu-json/src/util.rs
@@ -44,7 +44,8 @@ where
     }
 
     pub fn eof(&mut self) -> Result<bool> {
-        Ok(self.peek()?.is_none())
+        let ch = self.peek()?;
+        Ok(matches!(ch, None | Some(b'\x00')))
     }
 
     pub fn peek_next(&mut self, idx: usize) -> Result<Option<u8>> {