diff --git a/alembic/env.py b/alembic/env.py
index 8d40e79..4d69728 100644
--- a/alembic/env.py
+++ b/alembic/env.py
@@ -1,9 +1,12 @@
 from logging.config import fileConfig
 import os
 
+from dotenv import load_dotenv
 from sqlalchemy import create_engine
 from alembic import context
 
+load_dotenv()
+
 # Import models for autogenerate support
 from app.database import Base
 from app.models import *
diff --git a/app/ocpp_proto/chargepoint_manager.py b/app/ocpp_proto/chargepoint_manager.py
index 56b2885..9739b2f 100644
--- a/app/ocpp_proto/chargepoint_manager.py
+++ b/app/ocpp_proto/chargepoint_manager.py
@@ -3,6 +3,7 @@ from typing import Any, Coroutine, Dict
 from uuid import UUID
 
 from websockets import ConnectionClosed
+from starlette.websockets import WebSocketDisconnect
 
 from app.ocpp_proto.chargepoint import ChargePoint
 
@@ -12,7 +13,7 @@ async def start(id: UUID, cp: ChargePoint):
     try:
         __active_connections[id] = cp
         await cp.start()
-    except ConnectionClosed:
+    except (ConnectionClosed, WebSocketDisconnect):
         logging.info("Charging station '%s' (%s) disconnected", cp.id, id)
         __active_connections.pop(id, None)