diff --git a/CHANGELOG.md b/CHANGELOG.md
index c5876bdf..d7530e93 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - When a package is installed, it will be the first element of the table after refreshing
 - Progress bar status can now be controlled by the software manager while an operation is being executed
 - Flatpak: showing runtime branches as versions when they are not available
+- better internet offline handling
 - small UI improvements
 - installation logs are saved at **/tmp/bauh/logs/install**
 - Environment variable / parameter BAUH_UPDATE_NOTIFICATION renamed to BAUH_SYSTEM_NOTIFICATIONS and now works for any system notification
diff --git a/bauh/view/core/controller.py b/bauh/view/core/controller.py
index d867c64c..d133bf1b 100755
--- a/bauh/view/core/controller.py
+++ b/bauh/view/core/controller.py
@@ -161,7 +161,9 @@ class GenericSoftwareManager(SoftwareManager):
                         disk_loader = self.disk_loader_factory.new()
                         disk_loader.start()
 
-                    thread_internet_check.join()
+                    if thread_internet_check.isAlive():
+                        thread_internet_check.join()
+
                     mti = time.time()
                     man_res = man.read_installed(disk_loader=disk_loader, pkg_types=None, internet_available=internet_available['available'])
                     mtf = time.time()