diff --git a/src/UI/DocumentViews/MpvContainer.cc b/src/UI/DocumentViews/MpvContainer.cc
index 74c75fa129e95cba2b456b400600072bd792b26d..1f1232383ccc0085e0654b58c2846428e3175e7c 100644
--- a/src/UI/DocumentViews/MpvContainer.cc
+++ b/src/UI/DocumentViews/MpvContainer.cc
@@ -91,16 +91,17 @@ MpvContainer::registerMpvDurationCallback(std::function<void(double)> callback)
 void
 MpvContainer::closeMpv() noexcept
 {
-    RETURN_IF_NULLPTR(mpv);
-    logDebug() << "Closing the MPV context";
-    asyncCommand(AsyncCmdType::None, { "quit", nullptr });
-    registerMpvTimeCallback(nullptr);
-    registerMpvDurationCallback(nullptr);
-    asyncCommand(AsyncCmdType::None, { "quit", nullptr });
-    mpv_wait_async_requests(mpv);
-    mpv_destroy(mpv);
-    mpv                     = nullptr; // Stop all other callbacks here
-    isMpvAlreadyInitialized = false;   // De-init
+    if (mpv) {
+        logDebug() << "Closing the MPV context";
+        asyncCommand(AsyncCmdType::None, { "quit", nullptr });
+        registerMpvTimeCallback(nullptr);
+        registerMpvDurationCallback(nullptr);
+        asyncCommand(AsyncCmdType::None, { "quit", nullptr });
+        mpv_wait_async_requests(mpv);
+        mpv_destroy(mpv);
+        mpv = nullptr; // Stop all other callbacks here
+    }
+    isMpvAlreadyInitialized = false; // De-init
 }
 
 MpvContainer::~MpvContainer() noexcept { closeMpv(); }
@@ -108,8 +109,6 @@ MpvContainer::~MpvContainer() noexcept { closeMpv(); }
 void
 MpvContainer::handleMpvEvent(const mpv_event *const event) noexcept
 {
-    RETURN_IF_NULLPTR(mpv);
-
     // Declare here variables that can be used in the switch-case statements
     double time;
     QString msgText;
@@ -210,8 +209,6 @@ MpvContainer::getAssSid() const noexcept
 void
 MpvContainer::handleMpvEventCommandReply(const AsyncCmdType type) noexcept
 {
-    RETURN_IF_NULLPTR(mpv);
-
     switch (type) {
     case AsyncCmdType::None: break;
 
diff --git a/src/UI/DocumentViews/MpvControls.cc b/src/UI/DocumentViews/MpvControls.cc
index c3b7e1a44447bf5803fec7d74851b7ca50192242..453c87c5ff116415c0ee121c1bbd2329bfe93ca7 100644
--- a/src/UI/DocumentViews/MpvControls.cc
+++ b/src/UI/DocumentViews/MpvControls.cc
@@ -9,7 +9,6 @@ MpvControls::MpvControls(MpvContainer *passedContainer, QWidget *parent) noexcep
 {
     auto *progressBar          = new QSlider(this);
     auto *togglePlaybackButton = new QPushButton(playIcon, "", this); // Be default MPV is paused
-    auto *reCreateMpvButton    = new QPushButton(reCreateMpvIcon, "", this);
 
     progressBar->setTracking(false);
     progressBar->setOrientation(Qt::Horizontal);
@@ -55,7 +54,6 @@ MpvControls::MpvControls(MpvContainer *passedContainer, QWidget *parent) noexcep
     });
 
     connect(togglePlaybackButton, &QAbstractButton::clicked, mpv, &MpvContainer::mpvTogglePlayback);
-    connect(reCreateMpvButton, &QAbstractButton::clicked, mpv, &MpvContainer::reCreateMpvContext);
     connect(mpv, &MpvContainer::mpvPlaybackToggled, this,
             [this, togglePlaybackButton](bool isPlay) noexcept -> void {
                 togglePlaybackButton->setIcon(isPlay ? pauseIcon : playIcon);
@@ -63,7 +61,6 @@ MpvControls::MpvControls(MpvContainer *passedContainer, QWidget *parent) noexcep
 
     auto *centralLayout = new QHBoxLayout(this);
     centralLayout->addWidget(togglePlaybackButton);
-    centralLayout->addWidget(reCreateMpvButton);
     centralLayout->addWidget(progressBar, 1);
     setLayout(centralLayout);
 }
diff --git a/src/UI/DocumentViews/MpvControls.hh b/src/UI/DocumentViews/MpvControls.hh
index 84cd143aaa76c30f6fb293124b73b245729ec93e..5c792dc72af07ec2866f5bc07e7bd6eaec077a7a 100644
--- a/src/UI/DocumentViews/MpvControls.hh
+++ b/src/UI/DocumentViews/MpvControls.hh
@@ -23,7 +23,6 @@ private:
 
     const QIcon playIcon{ VIVY_ICON_PLAY };
     const QIcon pauseIcon{ VIVY_ICON_PAUSE };
-    const QIcon reCreateMpvIcon{ VIVY_ICON_RUN };
 
 public:
     explicit MpvControls(MpvContainer *mpv, QWidget *parent) noexcept;