diff --git a/oni-yasnippet.el b/oni-yasnippet.el
index 067df61..46a9e95 100644
--- a/oni-yasnippet.el
+++ b/oni-yasnippet.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2021.0715.212830
+;; Version: 2021.0919.235328
 ;; Package-Requires: (yasnippet yasnippet-snippets diminish)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -36,6 +36,8 @@
 
 (with-eval-after-load 'yasnippet (diminish 'yas-minor-mode))
 
+(setq-default yas-buffer-local-condition yas-not-string-or-comment-condition)
+
 (define-key yas-minor-mode-map (kbd "<tab>") nil)
 (define-key yas-minor-mode-map (kbd "C-\\") 'yas-expand)
 (define-key yas-minor-mode-map (kbd "SPC") yas-maybe-expand)