diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 9974eec..0c53212 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -1078,6 +1078,14 @@
   :config
   (global-git-gutter-mode t)
   (setq git-gutter:update-interval 0.2)
+
+  ;; Disable git-gutter on remote files
+  (defun git-gutter--turn-on ()
+    (when (and (buffer-file-name)
+               (not (memq major-mode git-gutter:disabled-modes))
+               (not (file-remote-p (buffer-file-name))))
+      (git-gutter-mode +1)))
+
   (use-package git-gutter-fringe :ensure :demand
     :config
     (define-fringe-bitmap 'git-gutter-fr:added [224] nil nil '(center repeated))