diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index ba50711ab..d8a04fcf3 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -43,6 +43,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 
 # Install Python dependencies from requirements.txt if it exists
 COPY requirements.txt requirements_tests.txt ./
-RUN pip3 install -r requirements.txt -r requirements_tests.txt \
+RUN pip3 install -U setuptools pip \
+    && pip3 install -r requirements.txt -r requirements_tests.txt \
     && pip3 install tox \
     && rm -f requirements.txt requirements_tests.txt
diff --git a/supervisor/__main__.py b/supervisor/__main__.py
index a6d2cf9ee..9e333b35c 100644
--- a/supervisor/__main__.py
+++ b/supervisor/__main__.py
@@ -5,7 +5,6 @@ import logging
 import sys
 
 from supervisor import bootstrap
-from supervisor.const import CoreState
 
 _LOGGER: logging.Logger = logging.getLogger(__name__)
 
@@ -54,10 +53,6 @@ if __name__ == "__main__":
         _LOGGER.info("Run Supervisor")
         loop.run_forever()
     finally:
-        if coresys.core.state != CoreState.CLOSE:
-            _LOGGER.info("Stopping Supervisor")
-            loop.run_until_complete(coresys.core.stop())
-        executor.shutdown(wait=False)
         loop.close()
 
     _LOGGER.info("Close Supervisor")