diff --git a/src/api/client_server/membership.rs b/src/api/client_server/membership.rs
index 1ca711e2..5c0169d2 100644
--- a/src/api/client_server/membership.rs
+++ b/src/api/client_server/membership.rs
@@ -241,6 +241,7 @@ pub async fn kick_user_route(
                 unsigned: None,
                 state_key: Some(body.user_id.to_string()),
                 redacts: None,
+                timestamp: None,
             },
             sender_user,
             &body.room_id,
@@ -313,6 +314,7 @@ pub async fn ban_user_route(body: Ruma<ban_user::v3::Request>) -> Result<ban_use
                 unsigned: None,
                 state_key: Some(body.user_id.to_string()),
                 redacts: None,
+                timestamp: None,
             },
             sender_user,
             &body.room_id,
@@ -386,6 +388,7 @@ pub async fn unban_user_route(
                 unsigned: None,
                 state_key: Some(body.user_id.to_string()),
                 redacts: None,
+                timestamp: None,
             },
             sender_user,
             &body.room_id,
@@ -938,6 +941,7 @@ async fn join_room_by_id_helper(
                     unsigned: None,
                     state_key: Some(sender_user.to_string()),
                     redacts: None,
+                    timestamp: None,
                 },
                 sender_user,
                 room_id,
@@ -1260,6 +1264,7 @@ pub(crate) async fn invite_helper<'a>(
                     unsigned: None,
                     state_key: Some(user_id.to_string()),
                     redacts: None,
+                    timestamp: None,
                 },
                 sender_user,
                 room_id,
@@ -1379,6 +1384,7 @@ pub(crate) async fn invite_helper<'a>(
                     unsigned: None,
                     state_key: Some(user_id.to_string()),
                     redacts: None,
+                    timestamp: None,
                 },
                 sender_user,
                 room_id,
@@ -1506,6 +1512,7 @@ pub async fn leave_room(user_id: &UserId, room_id: &RoomId, reason: Option<Strin
                     unsigned: None,
                     state_key: Some(user_id.to_string()),
                     redacts: None,
+                    timestamp: None,
                 },
                 user_id,
                 room_id,
diff --git a/src/api/client_server/message.rs b/src/api/client_server/message.rs
index c9b39f16..fbdda077 100644
--- a/src/api/client_server/message.rs
+++ b/src/api/client_server/message.rs
@@ -84,6 +84,11 @@ pub async fn send_message_event_route(
                 unsigned: Some(unsigned),
                 state_key: None,
                 redacts: None,
+                timestamp: if body.appservice_info.is_some() {
+                    body.timestamp
+                } else {
+                    None
+                },
             },
             sender_user,
             &body.room_id,
diff --git a/src/api/client_server/profile.rs b/src/api/client_server/profile.rs
index cf1db2d7..b90ae00e 100644
--- a/src/api/client_server/profile.rs
+++ b/src/api/client_server/profile.rs
@@ -65,6 +65,7 @@ pub async fn set_displayname_route(
                     unsigned: None,
                     state_key: Some(sender_user.to_string()),
                     redacts: None,
+                    timestamp: None,
                 },
                 room_id,
             ))
@@ -200,6 +201,7 @@ pub async fn set_avatar_url_route(
                     unsigned: None,
                     state_key: Some(sender_user.to_string()),
                     redacts: None,
+                    timestamp: None,
                 },
                 room_id,
             ))
diff --git a/src/api/client_server/redact.rs b/src/api/client_server/redact.rs
index f0603f4b..fd6ac7b0 100644
--- a/src/api/client_server/redact.rs
+++ b/src/api/client_server/redact.rs
@@ -44,6 +44,7 @@ pub async fn redact_event_route(
                 unsigned: None,
                 state_key: None,
                 redacts: Some(body.event_id.into()),
+                timestamp: None,
             },
             sender_user,
             &body.room_id,
diff --git a/src/api/client_server/room.rs b/src/api/client_server/room.rs
index 890ff9cb..9c49d6a4 100644
--- a/src/api/client_server/room.rs
+++ b/src/api/client_server/room.rs
@@ -230,6 +230,7 @@ pub async fn create_room_route(
                 unsigned: None,
                 state_key: Some("".to_owned()),
                 redacts: None,
+                timestamp: None,
             },
             sender_user,
             &room_id,
@@ -258,6 +259,7 @@ pub async fn create_room_route(
                 unsigned: None,
                 state_key: Some(sender_user.to_string()),
                 redacts: None,
+                timestamp: None,
             },
             sender_user,
             &room_id,
@@ -311,6 +313,7 @@ pub async fn create_room_route(
                 unsigned: None,
                 state_key: Some("".to_owned()),
                 redacts: None,
+                timestamp: None,
             },
             sender_user,
             &room_id,
@@ -334,6 +337,7 @@ pub async fn create_room_route(
                     unsigned: None,
                     state_key: Some("".to_owned()),
                     redacts: None,
+                    timestamp: None,
                 },
                 sender_user,
                 &room_id,
@@ -360,6 +364,7 @@ pub async fn create_room_route(
                 unsigned: None,
                 state_key: Some("".to_owned()),
                 redacts: None,
+                timestamp: None,
             },
             sender_user,
             &room_id,
@@ -381,6 +386,7 @@ pub async fn create_room_route(
                 unsigned: None,
                 state_key: Some("".to_owned()),
                 redacts: None,
+                timestamp: None,
             },
             sender_user,
             &room_id,
@@ -403,6 +409,7 @@ pub async fn create_room_route(
                 unsigned: None,
                 state_key: Some("".to_owned()),
                 redacts: None,
+                timestamp: None,
             },
             sender_user,
             &room_id,
@@ -447,6 +454,7 @@ pub async fn create_room_route(
                     unsigned: None,
                     state_key: Some("".to_owned()),
                     redacts: None,
+                    timestamp: None,
                 },
                 sender_user,
                 &room_id,
@@ -469,6 +477,7 @@ pub async fn create_room_route(
                     unsigned: None,
                     state_key: Some("".to_owned()),
                     redacts: None,
+                    timestamp: None,
                 },
                 sender_user,
                 &room_id,
@@ -629,6 +638,7 @@ pub async fn upgrade_room_route(
                 unsigned: None,
                 state_key: Some("".to_owned()),
                 redacts: None,
+                timestamp: None,
             },
             sender_user,
             &body.room_id,
@@ -730,6 +740,7 @@ pub async fn upgrade_room_route(
                 unsigned: None,
                 state_key: Some("".to_owned()),
                 redacts: None,
+                timestamp: None,
             },
             sender_user,
             &replacement_room,
@@ -758,6 +769,7 @@ pub async fn upgrade_room_route(
                 unsigned: None,
                 state_key: Some(sender_user.to_string()),
                 redacts: None,
+                timestamp: None,
             },
             sender_user,
             &replacement_room,
@@ -800,6 +812,7 @@ pub async fn upgrade_room_route(
                     unsigned: None,
                     state_key: Some("".to_owned()),
                     redacts: None,
+                    timestamp: None,
                 },
                 sender_user,
                 &replacement_room,
@@ -850,6 +863,7 @@ pub async fn upgrade_room_route(
                 unsigned: None,
                 state_key: Some("".to_owned()),
                 redacts: None,
+                timestamp: None,
             },
             sender_user,
             &body.room_id,
diff --git a/src/api/client_server/state.rs b/src/api/client_server/state.rs
index 8a47161c..03c6abc7 100644
--- a/src/api/client_server/state.rs
+++ b/src/api/client_server/state.rs
@@ -10,7 +10,7 @@ use ruma::{
         room::canonical_alias::RoomCanonicalAliasEventContent, AnyStateEventContent, StateEventType,
     },
     serde::Raw,
-    EventId, RoomId, UserId,
+    EventId, MilliSecondsSinceUnixEpoch, RoomId, UserId,
 };
 use tracing::log::warn;
 
@@ -32,6 +32,11 @@ pub async fn send_state_event_for_key_route(
         &body.event_type,
         &body.body.body, // Yes, I hate it too
         body.state_key.to_owned(),
+        if body.appservice_info.is_some() {
+            body.timestamp
+        } else {
+            None
+        },
     )
     .await?;
 
@@ -65,6 +70,11 @@ pub async fn send_state_event_for_empty_key_route(
         &body.event_type.to_string().into(),
         &body.body.body,
         body.state_key.to_owned(),
+        if body.appservice_info.is_some() {
+            body.timestamp
+        } else {
+            None
+        },
     )
     .await?;
 
@@ -190,6 +200,7 @@ async fn send_state_event_for_key_helper(
     event_type: &StateEventType,
     json: &Raw<AnyStateEventContent>,
     state_key: String,
+    timestamp: Option<MilliSecondsSinceUnixEpoch>,
 ) -> Result<Arc<EventId>> {
     let sender_user = sender;
 
@@ -243,6 +254,7 @@ async fn send_state_event_for_key_helper(
                 unsigned: None,
                 state_key: Some(state_key),
                 redacts: None,
+                timestamp,
             },
             sender_user,
             room_id,
diff --git a/src/api/server_server.rs b/src/api/server_server.rs
index 9d632899..3f59be65 100644
--- a/src/api/server_server.rs
+++ b/src/api/server_server.rs
@@ -1448,6 +1448,7 @@ pub async fn create_join_event_template_route(
             unsigned: None,
             state_key: Some(body.user_id.to_string()),
             redacts: None,
+            timestamp: None,
         },
         &body.user_id,
         &body.room_id,
diff --git a/src/service/admin/mod.rs b/src/service/admin/mod.rs
index 70c63381..583bfcd1 100644
--- a/src/service/admin/mod.rs
+++ b/src/service/admin/mod.rs
@@ -246,6 +246,7 @@ impl Service {
                                     unsigned: None,
                                     state_key: None,
                                     redacts: None,
+                                    timestamp: None,
                                 },
                                 conduit_user,
                                 &conduit_room,
@@ -1105,6 +1106,7 @@ impl Service {
                     unsigned: None,
                     state_key: Some("".to_owned()),
                     redacts: None,
+                    timestamp: None,
                 },
                 conduit_user,
                 &room_id,
@@ -1133,6 +1135,7 @@ impl Service {
                     unsigned: None,
                     state_key: Some(conduit_user.to_string()),
                     redacts: None,
+                    timestamp: None,
                 },
                 conduit_user,
                 &room_id,
@@ -1158,6 +1161,7 @@ impl Service {
                     unsigned: None,
                     state_key: Some("".to_owned()),
                     redacts: None,
+                    timestamp: None,
                 },
                 conduit_user,
                 &room_id,
@@ -1177,6 +1181,7 @@ impl Service {
                     unsigned: None,
                     state_key: Some("".to_owned()),
                     redacts: None,
+                    timestamp: None,
                 },
                 conduit_user,
                 &room_id,
@@ -1198,6 +1203,7 @@ impl Service {
                     unsigned: None,
                     state_key: Some("".to_owned()),
                     redacts: None,
+                    timestamp: None,
                 },
                 conduit_user,
                 &room_id,
@@ -1219,6 +1225,7 @@ impl Service {
                     unsigned: None,
                     state_key: Some("".to_owned()),
                     redacts: None,
+                    timestamp: None,
                 },
                 conduit_user,
                 &room_id,
@@ -1239,6 +1246,7 @@ impl Service {
                     unsigned: None,
                     state_key: Some("".to_owned()),
                     redacts: None,
+                    timestamp: None,
                 },
                 conduit_user,
                 &room_id,
@@ -1259,6 +1267,7 @@ impl Service {
                     unsigned: None,
                     state_key: Some("".to_owned()),
                     redacts: None,
+                    timestamp: None,
                 },
                 conduit_user,
                 &room_id,
@@ -1283,6 +1292,7 @@ impl Service {
                     unsigned: None,
                     state_key: Some("".to_owned()),
                     redacts: None,
+                    timestamp: None,
                 },
                 conduit_user,
                 &room_id,
@@ -1352,6 +1362,7 @@ impl Service {
                         unsigned: None,
                         state_key: Some(user_id.to_string()),
                         redacts: None,
+                        timestamp: None,
                     },
                     conduit_user,
                     &room_id,
@@ -1378,6 +1389,7 @@ impl Service {
                         unsigned: None,
                         state_key: Some(user_id.to_string()),
                         redacts: None,
+                        timestamp: None,
                     },
                     user_id,
                     &room_id,
@@ -1404,6 +1416,7 @@ impl Service {
                         unsigned: None,
                         state_key: Some("".to_owned()),
                         redacts: None,
+                        timestamp: None,
                     },
                     conduit_user,
                     &room_id,
@@ -1423,6 +1436,7 @@ impl Service {
                 unsigned: None,
                 state_key: None,
                 redacts: None,
+                timestamp: None,
             },
             conduit_user,
             &room_id,
diff --git a/src/service/pdu.rs b/src/service/pdu.rs
index 6991a083..dab7b6e0 100644
--- a/src/service/pdu.rs
+++ b/src/service/pdu.rs
@@ -460,4 +460,8 @@ pub struct PduBuilder {
     pub unsigned: Option<BTreeMap<String, serde_json::Value>>,
     pub state_key: Option<String>,
     pub redacts: Option<Arc<EventId>>,
+    /// For timestamped messaging, should only be used for appservices
+    ///
+    /// Will be set to current time if None
+    pub timestamp: Option<MilliSecondsSinceUnixEpoch>,
 }
diff --git a/src/service/rooms/state_accessor/mod.rs b/src/service/rooms/state_accessor/mod.rs
index 53e3176f..aa654aee 100644
--- a/src/service/rooms/state_accessor/mod.rs
+++ b/src/service/rooms/state_accessor/mod.rs
@@ -321,6 +321,7 @@ impl Service {
             unsigned: None,
             state_key: Some(target_user.into()),
             redacts: None,
+            timestamp: None,
         };
 
         Ok(services()
diff --git a/src/service/rooms/timeline/mod.rs b/src/service/rooms/timeline/mod.rs
index 29d8339d..6603ea65 100644
--- a/src/service/rooms/timeline/mod.rs
+++ b/src/service/rooms/timeline/mod.rs
@@ -22,8 +22,8 @@ use ruma::{
     },
     push::{Action, Ruleset, Tweak},
     state_res::{self, Event, RoomVersion},
-    uint, user_id, CanonicalJsonObject, CanonicalJsonValue, EventId, OwnedEventId, OwnedRoomId,
-    OwnedServerName, RoomId, RoomVersionId, ServerName, UserId,
+    uint, user_id, CanonicalJsonObject, CanonicalJsonValue, EventId, MilliSecondsSinceUnixEpoch,
+    OwnedEventId, OwnedRoomId, OwnedServerName, RoomId, RoomVersionId, ServerName, UserId,
 };
 use serde::Deserialize;
 use serde_json::value::{to_raw_value, RawValue as RawJsonValue};
@@ -665,6 +665,7 @@ impl Service {
             unsigned,
             state_key,
             redacts,
+            timestamp,
         } = pdu_builder;
 
         let prev_events: Vec<_> = services()
@@ -734,9 +735,9 @@ impl Service {
             event_id: ruma::event_id!("$thiswillbefilledinlater").into(),
             room_id: room_id.to_owned(),
             sender: sender.to_owned(),
-            origin_server_ts: utils::millis_since_unix_epoch()
-                .try_into()
-                .expect("time is valid"),
+            origin_server_ts: timestamp
+                .map(|ts| ts.get())
+                .unwrap_or_else(|| MilliSecondsSinceUnixEpoch::now().get()),
             kind: event_type,
             content,
             state_key,