diff --git a/build.sh b/build.sh
index b26cc5999..f04988309 100755
--- a/build.sh
+++ b/build.sh
@@ -392,19 +392,18 @@ then
     fi
 fi
 
-if [ "$LINT" = "YES" ];
+if [[ "$LINT" = "YES" || "$FRONTEND" = "YES" ]];
 then
-    if [ -z "$FRONTEND" ];
-    then
-        YarnInstall
-    fi
+    YarnInstall
+fi
 
+if [ "$LINT" = "YES" ];
+then
     LintUI
 fi
 
 if [ "$FRONTEND" = "YES" ];
 then
-    YarnInstall
     RunWebpack
 fi