diff --git a/containers/osbuild-composer/entrypoint.py b/containers/osbuild-composer/entrypoint.py
index 83759b91c..19622f410 100644
--- a/containers/osbuild-composer/entrypoint.py
+++ b/containers/osbuild-composer/entrypoint.py
@@ -330,15 +330,15 @@ class Cli(contextlib.AbstractContextManager):
                 proc_dnf_json.wait()
 
         except KeyboardInterrupt:
+            if proc_composer:
+                proc_composer.terminate()
+                res = proc_composer.wait()
             if proc_worker:
                 proc_worker.terminate()
                 proc_worker.wait()
             if proc_dnf_json:
                 proc_dnf_json.terminate()
                 proc_dnf_json.wait()
-            if proc_composer:
-                proc_composer.terminate()
-                res = proc_composer.wait()
         except:
             if proc_worker:
                 proc_worker.kill()