diff --git a/lib/redis-browser/browser.rb b/lib/redis-browser/browser.rb
index be2af9a..1840751 100644
--- a/lib/redis-browser/browser.rb
+++ b/lib/redis-browser/browser.rb
@@ -55,8 +55,8 @@ def keys(namespace = nil)
 
     def item_type(e)
       begin
-        ["json", MultiJson.decode(e)]
-      rescue MultiJson::LoadError
+        ["json", Marshal.load(e)]
+      rescue TypeError
         ["string", e]
       end
     end