diff --git a/modules/lang/scheme/autoload.el b/modules/lang/scheme/autoload.el
index 47d664680..75796492d 100644
--- a/modules/lang/scheme/autoload.el
+++ b/modules/lang/scheme/autoload.el
@@ -1,22 +1,5 @@
 ;;; lang/scheme/autoload.el -*- lexical-binding: t; -*-
 
-;; HACK `geiser' has poor autoload etiquette. It calls
-;;      `geiser-activate-implementation' and `geiser-implementation-extension'
-;;      in their autoloads files. Sure, these functions are autoloaded, but this
-;;      needlessly (and unavoidably) pulls in the `geiser-impl' package (et co)
-;;      when geiser-X's autoloads are read (i.e. at startup).
-;;
-;;      I rectify this by inlining calls to these two functions (and the
-;;      `geiser-impl--add-to-alist' sub-call in
-;;      `geiser-implementation-extension'), and autoloading the two variables
-;;      they operate on. I do this from our autoloads file (which is
-;;      byte-compiled and read at startup before package autoloads).
-;; TODO At some point, PR this behavior upstream (but not verbatim!)
-;;;###autoload (defvar geiser-active-implementations ())
-;;;###autoload (defvar geiser-implementations-alist ())
-;;;###autoload (eval-and-compile (dolist (sym '(geiser-impl--add-to-alist geiser-activate-implementation geiser-implementation-extension)) (put sym 'byte-optimizer 'byte-compile-inline-expand)))
-
-
 (defvar calculate-lisp-indent-last-sexp)
 ;; Adapted from https://github.com/alezost/emacs-config/blob/master/utils/al-scheme.el#L76-L123
 ;;;###autoload
diff --git a/modules/lang/scheme/packages.el b/modules/lang/scheme/packages.el
index 449e3c8a6..5486dba71 100644
--- a/modules/lang/scheme/packages.el
+++ b/modules/lang/scheme/packages.el
@@ -4,12 +4,12 @@
 (when (< emacs-major-version 29)
   (package! scheme
     :recipe (:host gitlab :repo "flatwhatson/scheme-mode")
-    :pin "aaef1f88cc34e8b6e07c207f9b8caff33f6e0740"))
+    :pin "51e586e5f1ddb5ea71d2cac8d401faf718c4627e"))
 
-(when (package! geiser :pin "e54d5e6dc659c252d10c4280f4c4d78d38623df5")
+(when (package! geiser :pin "49d12a14482ce9a193c049a5ccdd2fed90b0bdbe")
   (package! macrostep-geiser :pin "f6a2d5bb96ade4f23df557649af87ebd0cc45125")
   (when (modulep! +chez)
-    (package! geiser-chez :pin "246ec4c8bc4e7f64414e5cbe0fa66f0e5ef7d527"))
+    (package! geiser-chez :pin "605a81ff7b2d2b275a3ec68e3ce7e5b50f85014d"))
   (when (modulep! +chibi)
     (package! geiser-chibi :pin "5a6a5a580ea45cd4974df21629a8d50cbe3d6e99"))
   (when (modulep! +chicken)
@@ -19,12 +19,12 @@
   (when (modulep! +gauche)
     (package! geiser-gauche :pin "8ff743f6416f00751e24aef8b9791501a40f5421"))
   (when (modulep! +guile)
-    (package! geiser-guile :pin "24ce15de235c105daf5ecfb818200dae1c9815ee")
+    (package! geiser-guile :pin "ee33af6b4ef8fdaccbdf93c62b50fe17c07a1ade")
     (when (and (modulep! :checkers syntax)
              (not (modulep! :checkers syntax +flymake)))
       (package! flycheck-guile
         :recipe (:host github :repo "flatwhatson/flycheck-guile")
-        :pin "e23a4d7813179124fd98abf1c2f4190a72569bee")))
+        :pin "dd7bbdc48fd21cf8d270c913c56cd580f8ec3d03")))
   (when (modulep! +kawa)
     (package! geiser-kawa :pin "5896b19642923f74f718eb68d447560b2d26d797"))
   (when (modulep! +mit)