diff --git a/TwilioSMSReceiver.Common/MessageHandlers/BaseHandler.cs b/TwilioSMSReceiver.Common/MessageHandlers/BaseHandler.cs
index ab53059..c1696ed 100644
--- a/TwilioSMSReceiver.Common/MessageHandlers/BaseHandler.cs
+++ b/TwilioSMSReceiver.Common/MessageHandlers/BaseHandler.cs
@@ -31,9 +31,11 @@ namespace TwilioSMSReceiver.Common.MessageHandlers
                     message.IsForwardedYet = true;
                     sMSDbCtx.SMSMessages.Update(message);
                     await sMSDbCtx.SaveChangesAsync();
+                    await sMSDbCtx.DisposeAsync();
                     return true;
                 }
             }
+            await sMSDbCtx.DisposeAsync();
             return false;
         }
     }