diff --git a/CHANGELOG.md b/CHANGELOG.md
index 908947cd..b05db037 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,7 +13,7 @@
     * Fixed case-sensitive `accept` in `filepicker` field
     * Fixed HTML Entities in titles [#2028](https://github.com/getgrav/grav-plugin-admin/issues/2028)
     * Fixed deleting list field options completely, didn't save changes [#2056](https://github.com/getgrav/grav-plugin-admin/issues/2056)
-    * Fixed `onAdminAfterDelMedia` event always pointing to home page
+    * Fixed `onAdminAfterAddMedia` and `onAdminAfterDelMedia` events always pointing to the home page
 
 # v1.10.3
 ## 02/01/2021
diff --git a/classes/plugin/AdminController.php b/classes/plugin/AdminController.php
index e60d7eb9..1ec7e003 100644
--- a/classes/plugin/AdminController.php
+++ b/classes/plugin/AdminController.php
@@ -2224,7 +2224,8 @@ class AdminController extends AdminBaseController
             return false;
         }
 
-        $media = $this->getMedia();
+        $page = $this->admin->page($this->route);
+        $media = $page ? $this->getMedia($page) : null;
         if (!$media) {
             $this->admin->json_response = [
                 'status' => 'error',
@@ -2271,11 +2272,8 @@ class AdminController extends AdminBaseController
             }
         }
 
-        $page = $this->admin->page(true);
-        if ($page) {
-            // DEPRECATED: page
-            $this->grav->fireEvent('onAdminAfterAddMedia', new Event(['object' => $page, 'page' => $page]));
-        }
+        // DEPRECATED: page
+        $this->grav->fireEvent('onAdminAfterAddMedia', new Event(['object' => $page, 'page' => $page]));
 
         $this->admin->json_response = [
             'status'  => 'success',
@@ -2319,7 +2317,6 @@ class AdminController extends AdminBaseController
 
         echo json_encode($json_response);
         exit;
-
     }
 
     /**
@@ -2348,7 +2345,6 @@ class AdminController extends AdminBaseController
 
         echo json_encode($json_response);
         exit;
-
     }
 
     /**