diff --git a/src/components/playback/playbackmanager.js b/src/components/playback/playbackmanager.js
index 3b4099d540..9959544ae7 100644
--- a/src/components/playback/playbackmanager.js
+++ b/src/components/playback/playbackmanager.js
@@ -2260,6 +2260,10 @@ class PlaybackManager {
                     }, function () {
                         // TODO: show error message
                         self.stop(player);
+                        loading.hide();
+                    }).catch(() => {
+                        player.destroy();
+                        loading.hide();
                     });
                 });
             }
diff --git a/src/plugins/youtubePlayer/plugin.js b/src/plugins/youtubePlayer/plugin.js
index 7225de5960..2ac9a63783 100644
--- a/src/plugins/youtubePlayer/plugin.js
+++ b/src/plugins/youtubePlayer/plugin.js
@@ -143,10 +143,7 @@ function setCurrentSrc(instance, elem, options) {
                                 events.trigger(instance, 'pause');
                             }
                         },
-                        'onError': () => {
-                            instance.destroy();
-                            loading.hide();
-                        }
+                        'onError': () => reject(),
                     },
                     playerVars: {
                         controls: 0,