diff --git a/mod/events.php b/mod/events.php
index 1feab61d5b..85976f8f87 100644
--- a/mod/events.php
+++ b/mod/events.php
@@ -489,7 +489,7 @@ function events_content(App $a)
 		$fdt = $orig_event['finish'] ?? 'now';
 
 		$tz = date_default_timezone_get();
-		if (!empty($orig_event)) {
+		if (isset($orig_event['adjust'])) {
 			$tz = ($orig_event['adjust'] ? date_default_timezone_get() : 'UTC');
 		}
 
diff --git a/src/Model/Event.php b/src/Model/Event.php
index d2bc6ab86a..c59baba9cb 100644
--- a/src/Model/Event.php
+++ b/src/Model/Event.php
@@ -293,11 +293,10 @@ class Event
 		}
 		$private = intval($arr['private'] ?? 0);
 
-		$conditions = ['uid' => $event['uid']];
 		if ($event['cid']) {
-			$conditions['id'] = $event['cid'];
+			$conditions = ['id' => $event['cid']];
 		} else {
-			$conditions['self'] = true;
+			$conditions = ['uid' => $event['uid'], 'self' => true];
 		}
 
 		$contact = DBA::selectFirst('contact', [], $conditions);