diff --git a/geofencing/forms.py b/geofencing/forms.py
index dcfedc726..d3d51d949 100644
--- a/geofencing/forms.py
+++ b/geofencing/forms.py
@@ -1,3 +1,4 @@
+from django import forms
 from django.template.loader import render_to_string
 
 from base.forms import ModelForm
@@ -10,7 +11,8 @@ class GeoFencingSetupForm(ModelForm):
 
     class Meta:
         model = GeoFencing
-        exclude = ["company_id"]
+        fields = "__all__"
+        widgets = {"company_id": forms.HiddenInput()}
 
     def as_p(self):
         """
diff --git a/geofencing/templates/geo_config.html b/geofencing/templates/geo_config.html
index b2ea3a134..37b5a4f74 100644
--- a/geofencing/templates/geo_config.html
+++ b/geofencing/templates/geo_config.html
@@ -1,5 +1,4 @@
 <form hx-post="{% url 'geo-config' %}" hx-swap="none" hx-on-htmx-after-request="$('#reloadMessagesButton').click();">
     {% csrf_token %}
     {{form.as_p}}
-
 </form>
diff --git a/geofencing/views.py b/geofencing/views.py
index 5a842b81a..02a1383dc 100644
--- a/geofencing/views.py
+++ b/geofencing/views.py
@@ -164,22 +164,26 @@ def get_company_location(request):
 @login_required
 @permission_required("geofencing.add_localbackup")
 def geo_location_config(request):
-    try:
-        form = GeoFencingSetupForm(instance=get_company_location(request))
-    except:
-        form = GeoFencingSetupForm()
     if request.method == "POST":
         try:
             form = GeoFencingSetupForm(
                 request.POST, instance=get_company_location(request)
             )
-        except:
-            form = GeoFencingSetupForm(request.POST)
+        except Exception as e:
+            data = request.POST
+            if isinstance(data, QueryDict):
+                data = data.dict()
+            if get_company(request) == None:
+                data["company_id"] = None
+            form = GeoFencingSetupForm(data=data)
         if form.is_valid():
-            geofencing = form.save(commit=False)
-            geofencing.company_id = get_company(request)
-            geofencing.save()
+            form.save()
             messages.success(request, _("Geofencing config created successfully."))
         else:
             messages.info(request, "Not valid")
+
+    try:
+        form = GeoFencingSetupForm(instance=get_company_location(request))
+    except Exception as e:
+        form = GeoFencingSetupForm()
     return render(request, "geo_config.html", {"form": form})