diff --git a/pkg/company-yasnippet.el b/pkg/company-yasnippet.el
index 57f6fd6..739750c 100644
--- a/pkg/company-yasnippet.el
+++ b/pkg/company-yasnippet.el
@@ -82,6 +82,9 @@
     (insert " "))
   (company-indent-or-complete-common))
 
+;; Only use RETURN for completion in company
+(unbind-key "TAB" company-active-map)
+
 ;;; Yasnippet configuration
 (define-key prog-mode-map (kbd "C-c y") 'company-yasnippet)
 (define-key prog-mode-map (kbd "<f13>") 'insert-space-and-complete)