diff --git a/mythril/ethereum/util.py b/mythril/ethereum/util.py
index a053f496..76017951 100644
--- a/mythril/ethereum/util.py
+++ b/mythril/ethereum/util.py
@@ -13,7 +13,7 @@ import typing
 from pathlib import Path
 from requests.exceptions import ConnectionError
 from subprocess import PIPE, Popen
-
+from typing import Tuple
 
 from json.decoder import JSONDecodeError
 import semantic_version as semver
@@ -217,19 +217,13 @@ def extract_version(file: typing.Optional[str]):
             return str(version)
 
 
-def extract_binary(file: str) -> str:
+def extract_binary(file: str) -> Tuple[str, str]:
     file_data = None
     with open(file) as f:
         file_data = f.read()
 
     version = extract_version(file_data)
-    if (
-        version
-        and NpmSpec("^0.8.0").match(Version(version))
-        and "unchecked" not in file_data
-    ):
-        args.use_integer_module = False
 
     if version is None:
-        return os.environ.get("SOLC") or "solc"
-    return solc_exists(version)
+        return os.environ.get("SOLC") or "solc", version
+    return solc_exists(version), version
diff --git a/mythril/mythril/mythril_disassembler.py b/mythril/mythril/mythril_disassembler.py
index d93294b9..e1acc644 100644
--- a/mythril/mythril/mythril_disassembler.py
+++ b/mythril/mythril/mythril_disassembler.py
@@ -57,6 +57,7 @@ class MythrilDisassembler:
         solc_args=None,
     ) -> None:
         args.solc_args = solc_args
+        self.solc_version = solc_version
         self.solc_binary = self._init_solc_binary(solc_version)
         self.solc_settings_json = solc_settings_json
         self.eth = eth
@@ -68,8 +69,9 @@ class MythrilDisassembler:
     def _init_solc_binary(version: str) -> Optional[str]:
         """
         Only proper versions are supported. No nightlies, commits etc (such as available in remix).
+        This functions extracts
         :param version: Version of the solc binary required
-        :return: The solc binary of the corresponding version
+        :return: AThe solc binary of the corresponding version
         """
 
         if not version:
@@ -84,8 +86,6 @@ class MythrilDisassembler:
 
         if version.startswith("v"):
             version = version[1:]
-        if version and NpmSpec("^0.8.0").match(Version(version)):
-            args.use_integer_module = False
         if version == main_version_number:
             log.info("Given version matches installed version")
             solc_binary = os.environ.get("SOLC") or "solc"
@@ -231,6 +231,24 @@ class MythrilDisassembler:
                             self.sigs.add_sigs(original_filename, targets_json)
         return address, contracts
 
+    def check_run_integer_module(self, source_file):
+        # Strip leading 'v' from version if it's there
+        normalized_version = self.solc_version.lstrip("v")
+
+        # Check if solc_version is not provided or doesn't match the required version
+        # As post 0.8.0 solc versions automatically add assertions to sanity check arithmetic
+        if not self.solc_version or not NpmSpec("^0.8.0").match(
+            Version(normalized_version)
+        ):
+            return True
+
+        with open(source_file, "r") as f:
+            for line in f:
+                if "unchecked" in line:
+                    return True
+
+        return False
+
     def load_from_solidity(
         self, solidity_files: List[str]
     ) -> Tuple[str, List[SolidityContract]]:
@@ -248,7 +266,11 @@ class MythrilDisassembler:
                 contract_name = None
 
             file = os.path.expanduser(file)
-            solc_binary = self.solc_binary or util.extract_binary(file)
+            solc_binary = self.solc_binary
+            if solc_binary is None:
+                solc_binary, self.solc_version = util.extract_binary(file)
+            if self.check_run_integer_module(file) is False:
+                args.use_integer_module = False
             try:
                 # import signatures from solidity source
                 self.sigs.import_solidity_file(
diff --git a/tests/integration_tests/version_test.py b/tests/integration_tests/version_test.py
index 7baf57cc..6b00b3c6 100644
--- a/tests/integration_tests/version_test.py
+++ b/tests/integration_tests/version_test.py
@@ -15,6 +15,8 @@ test_data = (
     ("version_2.sol", None, True),
     ("version_3.sol", None, True),
     ("version_patch.sol", None, False),
+    ("integer_edge_case.sol", None, True),
+    ("integer_edge_case.sol", "v0.8.19", True),
 )
 
 
diff --git a/tests/testdata/input_contracts/integer_edge_case.sol b/tests/testdata/input_contracts/integer_edge_case.sol
new file mode 100644
index 00000000..a3258dc4
--- /dev/null
+++ b/tests/testdata/input_contracts/integer_edge_case.sol
@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.19;
+contract B {
+    function f(uint256 arg) public view returns(uint256) {
+        uint256 res;
+        unchecked{        
+            res = 10_000_000_000 * arg; // undetected overflow
+        }
+        //assert(res > arg); // the assertion violation is correctly detected if added
+        return res;       
+    }
+}