diff --git a/modules/languages/siren-golang.el b/modules/languages/siren-golang.el
index a87b68a..851d973 100644
--- a/modules/languages/siren-golang.el
+++ b/modules/languages/siren-golang.el
@@ -22,7 +22,6 @@
 
   :hook
   (go-mode . siren-go-mode-setup)
-  (before-save . gofmt-before-save)
 
   :init
   (add-to-list 'projectile-globally-ignored-directories "Godeps")
@@ -48,6 +47,8 @@
   :config
   (message "loading go-mode")
 
+  (add-hook 'before-save-hook #'gofmt-before-save)
+
   (when (memq window-system '(mac ns))
     (exec-path-from-shell-copy-env "GOPATH"))
 
diff --git a/modules/languages/siren-typescript.el b/modules/languages/siren-typescript.el
index f1c0c90..ad934f8 100644
--- a/modules/languages/siren-typescript.el
+++ b/modules/languages/siren-typescript.el
@@ -38,7 +38,6 @@
 
 (use-package tide
   :hook
-  ;; (before-save . tide-format-before-save)
   (typescript-mode . siren-tide-mode-setup)
   (web-mode . siren-tide-web-mode-setup)
 
@@ -63,7 +62,11 @@
     (flycheck-mode +1)
     (eldoc-mode +1)
     (tide-hl-identifier-mode +1)
-    (company-mode +1)))
+    (company-mode +1))
+
+  :config
+  ;; (add-hook 'before-save-hook #'tide-format-before-save)
+  )
 
 (provide 'siren-typescript)
 ;;; siren-typescript.el ends here