diff --git a/apps/emqx_modules/src/emqx_delayed.erl b/apps/emqx_modules/src/emqx_delayed.erl
index 8a8011575..21757b528 100644
--- a/apps/emqx_modules/src/emqx_delayed.erl
+++ b/apps/emqx_modules/src/emqx_delayed.erl
@@ -135,7 +135,7 @@ format_delayed(Delayed) ->
 format_delayed(#delayed_message{key = {ExpectTimeStamp, Id}, delayed = Delayed,
             msg = #message{topic = Topic,
                            from = From,
-                           headers = #{username := Username},
+                           headers = Headers,
                            qos = Qos,
                            timestamp = PublishTimeStamp,
                            payload = Payload}}, WithPayload) ->
@@ -151,7 +151,7 @@ format_delayed(#delayed_message{key = {ExpectTimeStamp, Id}, delayed = Delayed,
         topic => Topic,
         qos => Qos,
         from_clientid => From,
-        from_username => Username
+        from_username => maps:get(username, Headers, undefined)
     },
     case WithPayload of
         true ->