diff --git a/src/_yarn b/src/_yarn
index 382f58a..34718e0 100644
--- a/src/_yarn
+++ b/src/_yarn
@@ -240,7 +240,8 @@ _yarn() {
 
         run)
           _arguments \
-            '1: :_yarn_scripts'
+            '1: :_yarn_scripts' \
+            '*:: :_default'
         ;;
 
         tag)
@@ -266,6 +267,10 @@ _yarn() {
           _arguments \
             '1:query:_files'
         ;;
+
+        *) 
+          _default
+        ;;
       esac
     ;;
   esac