diff --git a/app/src/main/java/org/schabi/newpipe/fragments/BaseStateFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/BaseStateFragment.java
index 0de3ea012..db91755df 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/BaseStateFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/BaseStateFragment.java
@@ -56,12 +56,6 @@ public abstract class BaseStateFragment<I> extends BaseFragment implements ViewC
         }
     }
 
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        errorPanelHelper.dispose();
-    }
-
     /*//////////////////////////////////////////////////////////////////////////
     // Init
     //////////////////////////////////////////////////////////////////////////*/
@@ -74,6 +68,14 @@ public abstract class BaseStateFragment<I> extends BaseFragment implements ViewC
         errorPanelHelper = new ErrorPanelHelper(this, rootView, this::onRetryButtonClicked);
     }
 
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        if (errorPanelHelper != null) {
+            errorPanelHelper.dispose();
+        }
+    }
+
     protected void onRetryButtonClicked() {
         reloadContent();
     }