diff --git a/modules/feature/version-control/+git.el b/modules/feature/version-control/+git.el
index 1042d0bb4..ba25b69d3 100644
--- a/modules/feature/version-control/+git.el
+++ b/modules/feature/version-control/+git.el
@@ -12,7 +12,11 @@
 (def-package! git-gutter-fringe
   :commands git-gutter-mode
   :init
-  (add-hook! (text-mode prog-mode conf-mode) 'git-gutter-mode)
+  (defun +version-control|git-gutter-maybe ()
+    (when (and (buffer-file-name)
+               (not (file-remote-p (buffer-file-name))))
+      (git-gutter-mode +1)))
+  (add-hook! (text-mode prog-mode conf-mode) '+version-control|git-gutter-maybe)
   :config
   (set! :popup "^\\*git-gutter.+\\*$" :regexp t :size 15 :noselect t)