diff --git a/app/__init__.py b/app/__init__.py
index 97be7c35..ef2565b9 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -92,3 +92,10 @@ def check_for_ban():
 		elif current_user.rank == models.UserRank.NOT_JOINED:
 			current_user.rank = models.UserRank.MEMBER
 			models.db.session.commit()
+
+from .utils import clearNotifications
+
+@app.before_request
+def check_for_notifications():
+	if current_user.is_authenticated:
+		clearNotifications(request.path)
diff --git a/app/blueprints/packages/editrequests.py b/app/blueprints/packages/editrequests.py
index f50a8120..3dd61596 100644
--- a/app/blueprints/packages/editrequests.py
+++ b/app/blueprints/packages/editrequests.py
@@ -119,7 +119,6 @@ def view_editrequest_page(package, id):
 	if erequest is None or erequest.package != package:
 		abort(404)
 
-	clearNotifications(erequest.getURL())
 	return render_template("packages/editrequest_view.html", package=package, request=erequest)
 
 
diff --git a/app/blueprints/packages/packages.py b/app/blueprints/packages/packages.py
index 0ee46568..b765eae1 100644
--- a/app/blueprints/packages/packages.py
+++ b/app/blueprints/packages/packages.py
@@ -101,8 +101,6 @@ def getReleases(package):
 @bp.route("/packages/<author>/<name>/")
 @is_package_page
 def view(package):
-	clearNotifications(package.getDetailsURL())
-
 	alternatives = None
 	if package.type == PackageType.MOD:
 		alternatives = Package.query \
diff --git a/app/blueprints/packages/releases.py b/app/blueprints/packages/releases.py
index f06f055f..33e8a1f8 100644
--- a/app/blueprints/packages/releases.py
+++ b/app/blueprints/packages/releases.py
@@ -157,8 +157,6 @@ def edit_release(package, id):
 	if release is None or release.package != package:
 		abort(404)
 
-	clearNotifications(release.getEditURL())
-
 	canEdit	= package.checkPerm(current_user, Permission.MAKE_RELEASE)
 	canApprove = package.checkPerm(current_user, Permission.APPROVE_RELEASE)
 	if not (canEdit or canApprove):
diff --git a/app/blueprints/packages/screenshots.py b/app/blueprints/packages/screenshots.py
index 12144ea9..93644691 100644
--- a/app/blueprints/packages/screenshots.py
+++ b/app/blueprints/packages/screenshots.py
@@ -81,8 +81,6 @@ def edit_screenshot(package, id):
 	if not (canEdit or canApprove):
 		return redirect(package.getDetailsURL())
 
-	clearNotifications(screenshot.getEditURL())
-
 	# Initial form class from post data and default data
 	form = EditScreenshotForm(formdata=request.form, obj=screenshot)
 
diff --git a/app/blueprints/threads/__init__.py b/app/blueprints/threads/__init__.py
index 1455c5df..ad585458 100644
--- a/app/blueprints/threads/__init__.py
+++ b/app/blueprints/threads/__init__.py
@@ -82,8 +82,6 @@ def unsubscribe(id):
 
 @bp.route("/threads/<int:id>/", methods=["GET", "POST"])
 def view(id):
-	clearNotifications(url_for("threads.view", id=id))
-
 	thread = Thread.query.get(id)
 	if thread is None or not thread.checkPerm(current_user, Permission.SEE_THREAD):
 		abort(404)