diff --git a/fdroidserver/scanner.py b/fdroidserver/scanner.py
index 3e20f4cf..51497bcd 100644
--- a/fdroidserver/scanner.py
+++ b/fdroidserver/scanner.py
@@ -332,6 +332,10 @@ class ScannerTool():
         # definitions from config.yml here
 
         self.scanner_data_lookup()
+
+        if options and options.refresh_scanner:
+            self.refresh()
+
         self.load()
         self.compile_regexes()
 
@@ -802,9 +806,6 @@ def main():
     # initialize/load configuration values
     common.get_config(opts=options)
 
-    if options.refresh:
-        scanner._get_tool().refresh()
-
     probcount = 0
 
     appids = []