diff --git a/core/control/Controller.php b/core/control/Controller.php
index 65691bb60..dd77c2079 100755
--- a/core/control/Controller.php
+++ b/core/control/Controller.php
@@ -81,7 +81,7 @@ class Controller extends RequestHandler {
 		if(Session::get('loggedInAs') && Security::database_is_ready()) {
 			$member = Member::currentUser();
 			if($member) {
-				Cookie::set("PastMember", true, 90, null, null, false, true);
+				if(!headers_sent()) Cookie::set("PastMember", true, 90, null, null, false, true);
 				DB::query("UPDATE \"Member\" SET \"LastVisited\" = " . DB::getConn()->now() . " WHERE \"ID\" = $member->ID", null);
 			}
 		}