diff --git a/data/js/tomahawk.js b/data/js/tomahawk.js
index c3e312d13..9cfdf7e22 100644
--- a/data/js/tomahawk.js
+++ b/data/js/tomahawk.js
@@ -277,17 +277,25 @@ Tomahawk.Resolver = {
     },
     _adapter_resolve: function (params) {
         return RSVP.Promise.resolve(this.resolve(params)).then(function (results) {
-            return {
-                'tracks': results
-            };
+            if(Array.isArray(results)) {
+                return {
+                    'tracks': results
+                };
+            }
+
+            return results;
         });
     },
 
     _adapter_search: function (params) {
         return RSVP.Promise.resolve(this.search(params)).then(function (results) {
-            return {
-                'tracks': results
-            };
+            if(Array.isArray(results)) {
+                return {
+                    'tracks': results
+                };
+            }
+
+            return results;
         });
     },