diff --git a/pkg/api/playlist.go b/pkg/api/playlist.go
index abc092b8021..7aa3c7d0057 100644
--- a/pkg/api/playlist.go
+++ b/pkg/api/playlist.go
@@ -17,6 +17,11 @@ func ValidateOrgPlaylist(c *middleware.Context) {
 		return
 	}
 
+	if query.Result.OrgId == 0 {
+		c.JsonApiErr(404, "Playlist not found", err)
+		return
+	}
+
 	if query.Result.OrgId != c.OrgId {
 		c.JsonApiErr(403, "You are not allowed to edit/view playlist", nil)
 		return
diff --git a/public/app/features/playlist/playlist_routes.js b/public/app/features/playlist/playlist_routes.js
index e61ed2d6527..646fd55ff4b 100644
--- a/public/app/features/playlist/playlist_routes.js
+++ b/public/app/features/playlist/playlist_routes.js
@@ -26,6 +26,9 @@ function (angular) {
         controller : 'PlaylistEditCtrl'
       })
       .when('/playlists/play/:id', {
+        templateUrl: 'public/app/features/playlist/partials/playlists.html',
+        controllerAs: 'ctrl',
+        controller : 'PlaylistsCtrl',
         resolve: {
           init: function(playlistSrv, $route) {
             var playlistId = $route.current.params.id;