diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js
index 97a52724d2..de20693eb0 100644
--- a/public/src/ajaxify.js
+++ b/public/src/ajaxify.js
@@ -67,7 +67,8 @@ $(document).ready(function() {
 		url = ajaxify.start(url);
 
 		// If any listeners alter url and set it to an empty string, abort the ajaxification
-		if (url === '') {
+		if (url === null) {
+			$(window).trigger('action:ajaxify.end', {url: url, tpl_url: ajaxify.data.template.name, title: ajaxify.data.title});
 			return false;
 		}
 
diff --git a/public/src/client/footer.js b/public/src/client/footer.js
index f1d05d4bfe..30da71aa12 100644
--- a/public/src/client/footer.js
+++ b/public/src/client/footer.js
@@ -50,10 +50,12 @@ define('forum/footer', ['notifications', 'chat', 'components', 'translator'], fu
 		}
 
 		$(window).on('action:ajaxify.end', function(ev, data) {
-			var tid = data.url.match(/^topic\/(\d+)/);
+			if (data.url) {
+				var tid = data.url.match(/^topic\/(\d+)/);
 
-			if (tid && tid[1]) {
-				delete unreadTopics[tid[1]];
+				if (tid && tid[1]) {
+					delete unreadTopics[tid[1]];
+				}
 			}
 		});
 
diff --git a/public/src/client/topic.js b/public/src/client/topic.js
index da4e5456e8..aff00909d1 100644
--- a/public/src/client/topic.js
+++ b/public/src/client/topic.js
@@ -31,7 +31,7 @@ define('forum/topic', [
 			$(window).off('keydown', onKeyDown);
 		}
 
-		if (!data.url.startsWith('topic/')) {
+		if (data.url && !data.url.startsWith('topic/')) {
 			require(['search'], function(search) {
 				if (search.topicDOM.active) {
 					search.topicDOM.end();