diff --git a/boot.php b/boot.php
index ac6cbc9550..c3ad39cd57 100644
--- a/boot.php
+++ b/boot.php
@@ -947,6 +947,10 @@ function public_contact() {
  * @return int|bool visitor_id or false
  */
 function remote_user() {
+	// You cannot be both local and remote
+	if (local_user()) {
+		return false;
+	}
 	if ((x($_SESSION, 'authenticated')) && (x($_SESSION, 'visitor_id'))) {
 		return intval($_SESSION['visitor_id']);
 	}