diff --git a/components/onlinepackagemanager/opkman_intf.pas b/components/onlinepackagemanager/opkman_intf.pas
index 81ed0c282d..546f3ba2ec 100644
--- a/components/onlinepackagemanager/opkman_intf.pas
+++ b/components/onlinepackagemanager/opkman_intf.pas
@@ -131,9 +131,10 @@ begin
           PackageDownloader.DownloadJSON(Options.ConTimeOut*1000, True);
         Exit;
       end;
-      if (not FBusyUpdating) then
-        if (Assigned(OnPackageListAvailable)) then
-          OnPackageListAvailable(Self);
+      if (not Application.terminated) then
+        if (not FBusyUpdating) then
+          if (Assigned(OnPackageListAvailable)) then
+            OnPackageListAvailable(Self);
     end;
   end;
 end;