diff --git a/container/setup.py b/container/setup.py
index c3a0843..f5eddc5 100755
--- a/container/setup.py
+++ b/container/setup.py
@@ -39,14 +39,15 @@ def setup():
     get_latest_codeql(args)
     logger.info("End setup...")
 def get_latest_codeql(args):
-    # what version do we have?
     codeql = CodeQL(CODEQL_HOME)
-    current_installed_version = codeql.get_current_local_version()
-    logger.info(f'Current codeql version: {current_installed_version}')
-    latest_online_version = codeql.get_latest_codeql_github_version()
-    if current_installed_version != latest_online_version.title and args.check_latest_cli:
-        # we got a newer version online, download and install it
-        codeql.download_and_install_latest_codeql(latest_online_version)
+    # what version do we have?
+    if args.check_latest_cli:
+        current_installed_version = codeql.get_current_local_version()
+        logger.info(f'Current codeql version: {current_installed_version}')
+        latest_online_version = codeql.get_latest_codeql_github_version()
+        if current_installed_version != latest_online_version.title:
+            # we got a newer version online, download and install it
+            codeql.download_and_install_latest_codeql(latest_online_version)
     # get the latest queries regardless (TODO: Optimize by storing and checking the last commit hash?)
     if args.check_latest_queries:
         codeql.download_and_install_latest_codeql_queries()