diff --git a/lib/controller/checks.py b/lib/controller/checks.py
index f636568a0..65f264077 100644
--- a/lib/controller/checks.py
+++ b/lib/controller/checks.py
@@ -111,12 +111,12 @@ def checkSqlInjection(place, parameter, value):
                         msg += "Do you want to skip test payloads specific for other DBMSes? [Y/n]"
                         kb.reduceTests = [] if readInput(msg, default='Y').upper() != 'Y' else (Backend.getErrorParsedDBMSes() or [kb.heuristicDbms])
 
-                    if kb.extendTests is None:
+                    if kb.extendTests is None and (conf.level < 5 or conf.risk < 3):
                         _ = (Format.getErrorParsedDBMSes() if Backend.getErrorParsedDBMSes() else kb.heuristicDbms)
                         msg = "do you want to include all tests for '%s' " % _
                         msg += "extending provided level (%d) and risk (%s) values? [Y/n]" % (conf.level, conf.risk)
                         kb.extendTests = [] if readInput(msg, default='Y').upper() != 'Y' else (Backend.getErrorParsedDBMSes() or [kb.heuristicDbms])
-            elif kb.extendTests is None and conf.level < 5 and conf.risk < 3:
+            elif kb.extendTests is None and (conf.level < 5 or conf.risk < 3):
                 msg = "do you want to include all tests for '%s' " % conf.dbms
                 msg += "extending provided level (%d) and risk (%s)? [Y/n]" % (conf.level, conf.risk)
                 kb.extendTests = [] if readInput(msg, default='Y').upper() != 'Y' else ([conf.dbms])