diff --git a/python/ycm/youcompleteme.py b/python/ycm/youcompleteme.py
index c3f07aed..a64c2ba5 100644
--- a/python/ycm/youcompleteme.py
+++ b/python/ycm/youcompleteme.py
@@ -332,7 +332,10 @@ class YouCompleteMe( object ):
     filetypes = vimsupport.CurrentFiletypes()
     filetype_to_disable = self._user_options[
       'filetype_specific_completion_to_disable' ]
-    return not all([ x in filetype_to_disable for x in filetypes ])
+    if '*' in filetype_to_disable:
+      return False
+    else:
+      return not all([ x in filetype_to_disable for x in filetypes ])
 
 
   def _AddSyntaxDataIfNeeded( self, extra_data ):