diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js
index b155efdaf3..df38821297 100644
--- a/public/src/ajaxify.js
+++ b/public/src/ajaxify.js
@@ -150,13 +150,18 @@ $(document).ready(function() {
 	}
 
 	ajaxify.end = function(url, tpl_url) {
+		function done() {
+			if (--count === 0) {
+				$(window).trigger('action:ajaxify.end', {url: url});
+			}
+		}
+		var count = 2;
+
 		ajaxify.variables.parse();
 
-		ajaxify.loadScript(tpl_url);
+		ajaxify.loadScript(tpl_url, done);
 
-		ajaxify.widgets.render(tpl_url, url, function() {
-			$(window).trigger('action:ajaxify.end', {url: url});
-		});
+		ajaxify.widgets.render(tpl_url, url, done);
 
 		$(window).trigger('action:ajaxify.contentLoaded', {url: url, tpl: tpl_url});
 
diff --git a/public/src/client/groups/list.js b/public/src/client/groups/list.js
index 5baee1bcc1..d36d73bac3 100644
--- a/public/src/client/groups/list.js
+++ b/public/src/client/groups/list.js
@@ -61,7 +61,10 @@ define('forum/groups/list', ['forum/infinitescroll'], function(infinitescroll) {
 			} else {
 				done();
 			}
-			$('[component="groups/container"]').attr('data-nextstart', data.nextStart);
+
+			if (data && data.nextStart) {
+				$('[component="groups/container"]').attr('data-nextstart', data.nextStart);
+			}
 		});
 	}