diff --git a/custom_components/family_safety/config_flow.py b/custom_components/family_safety/config_flow.py
index 6aef440..176bade 100644
--- a/custom_components/family_safety/config_flow.py
+++ b/custom_components/family_safety/config_flow.py
@@ -132,10 +132,14 @@ async def _async_create_entry(self, **kwargs) -> config_entries.FlowResult:
         tracked_applications = self._get_config_entry("tracked_applications")
         if kwargs.get("tracked_applications", None) is not None:
             tracked_applications = kwargs.get("tracked_applications")
+        if tracked_applications is None:
+            tracked_applications = []
 
         accounts = self._get_config_entry("accounts")
         if kwargs.get("accounts", None) is not None:
             accounts = kwargs.get("accounts")
+        if accounts is None:
+            accounts = []
 
         await self.family_safety.api.end_session()
         return self.async_create_entry(
@@ -194,6 +198,8 @@ async def async_step_applications(
         tracked_applications = self.config_entry.data.get("tracked_applications", [])
         if self.config_entry.options:
             tracked_applications = self.config_entry.options.get("tracked_applications", [])
+        if tracked_applications is None:
+            tracked_applications = []
         for app in tracked_applications:
             try:
                 default_tracked_applications.append(
@@ -235,6 +241,8 @@ async def async_step_accounts(
 
         default_tracked_accounts = []
         tracked_accounts = self.config_entry.data.get("accounts", [])
+        if tracked_accounts is None:
+            tracked_accounts = []
         if self.config_entry.options:
             tracked_accounts = self.config_entry.options.get("accounts", [])
         for account in tracked_accounts:
diff --git a/custom_components/family_safety/const.py b/custom_components/family_safety/const.py
index 6ddc3d1..3ac0613 100644
--- a/custom_components/family_safety/const.py
+++ b/custom_components/family_safety/const.py
@@ -6,7 +6,7 @@
 
 NAME = "Microsoft Family Safety"
 DOMAIN = "family_safety"
-VERSION = "1.1.0b3"
+VERSION = "1.1.0b4"
 
 DEFAULT_OVERRIDE_ENTITIES = [OverrideTarget.MOBILE,
                              OverrideTarget.WINDOWS,
diff --git a/custom_components/family_safety/manifest.json b/custom_components/family_safety/manifest.json
index c8f0ec7..e71814f 100644
--- a/custom_components/family_safety/manifest.json
+++ b/custom_components/family_safety/manifest.json
@@ -11,6 +11,6 @@
   "requirements": ["pyfamilysafety==0.1.1"],
   "ssdp": [],
   "zeroconf": [],
-  "version": "1.1.0b3",
+  "version": "1.1.0b4",
   "integration_type": "service"
 }
\ No newline at end of file