diff --git a/modules/tools/wakatime/autoload.el b/modules/tools/wakatime/autoload.el
new file mode 100644
index 000000000..915abcce9
--- /dev/null
+++ b/modules/tools/wakatime/autoload.el
@@ -0,0 +1,13 @@
+;;; tools/wakatime/autoload.el -*- lexical-binding: t; -*-
+
+;;;###autoload
+(add-hook 'doom-after-switch-buffer-hook #'+wakatime-init)
+
+;;;###autoload
+(defun +wakatime-init ()
+  "Initialize wakatime (if `wakatime-api-key' is set, otherwise no-op with a
+warning)."
+  (if wakatime-api-key
+      (global-wakatime-mode +1)
+    (message "No `wakatime-api-key' set! wakaktime-mode will stay disabled."))
+  (remove-hook 'doom-after-switch-buffer-hook #'+wakatime-init))
diff --git a/modules/tools/wakatime/packages.el b/modules/tools/wakatime/packages.el
new file mode 100644
index 000000000..2df681c92
--- /dev/null
+++ b/modules/tools/wakatime/packages.el
@@ -0,0 +1,4 @@
+;; -*- no-byte-compile: t; -*-
+;;; tools/wakatime/packages.el
+
+(package! wakatime-mode)