diff --git a/engine/apps/grafana_plugin/helpers/gcom.py b/engine/apps/grafana_plugin/helpers/gcom.py
index e83ab969..d55c1b36 100644
--- a/engine/apps/grafana_plugin/helpers/gcom.py
+++ b/engine/apps/grafana_plugin/helpers/gcom.py
@@ -60,18 +60,20 @@ def check_gcom_permission(token_string: str, context) -> GcomToken:
                 )
 
             # Get org from db or create a new one
-            organization, _ = Organization.objects.get_or_create(
+            organization, _ = Organization.objects.update_or_create(
                 stack_id=instance_info["id"],
-                stack_slug=instance_info["slug"],
-                grafana_url=instance_info["url"],
                 org_id=instance_info["orgId"],
-                org_slug=instance_info["orgSlug"],
-                org_title=instance_info["orgName"],
-                region_slug=instance_info["regionSlug"],
-                cluster_slug=instance_info["clusterSlug"],
-                gcom_token=token_string,
-                api_token=grafana_token,
-                defaults={"gcom_token_org_last_time_synced": timezone.now()},
+                defaults={
+                    "gcom_token_org_last_time_synced": timezone.now(),
+                    "stack_slug": instance_info["slug"],
+                    "grafana_url": instance_info["url"],
+                    "org_slug": instance_info["orgSlug"],
+                    "org_title": instance_info["orgName"],
+                    "region_slug": instance_info["regionSlug"],
+                    "cluster_slug": instance_info["clusterSlug"],
+                    "gcom_token": token_string,
+                    "api_token": grafana_token,
+                },
             )
     else:
         organization.stack_slug = instance_info["slug"]
diff --git a/engine/apps/grafana_plugin/tests/test_gcom.py b/engine/apps/grafana_plugin/tests/test_gcom.py
index c70f0719..b13ac0c1 100644
--- a/engine/apps/grafana_plugin/tests/test_gcom.py
+++ b/engine/apps/grafana_plugin/tests/test_gcom.py
@@ -3,6 +3,7 @@ from unittest.mock import patch
 import pytest
 
 from apps.grafana_plugin.helpers.gcom import check_gcom_permission
+from apps.user_management.models import Organization
 
 
 @pytest.mark.parametrize(
@@ -59,3 +60,49 @@ def test_check_gcom_permission_updates_fields(make_organization, api_token, api_
     assert org.api_token == api_token if api_token_updated else broken_token
     assert org.gcom_token == gcom_token
     assert org.gcom_token_org_last_time_synced != last_time_gcom_synced
+
+
+@pytest.mark.django_db
+def test_check_gcom_permission_uniqueness_update_fields(make_organization):
+    gcom_token = "gcom:test_token"
+    fixed_token = "fixed_token"
+    instance_info = {
+        "id": 324534,
+        "slug": "testinstance",
+        "url": "http://example.com",
+        "orgId": 5671,
+        "orgSlug": "testorg",
+        "orgName": "Test Org",
+        "regionSlug": "us",
+        "clusterSlug": "us-test",
+    }
+    context = {
+        "stack_id": str(instance_info["id"]),
+        "org_id": str(instance_info["orgId"]),
+        "grafana_token": fixed_token,
+    }
+
+    org = make_organization(stack_id=instance_info["id"], org_id=instance_info["orgId"], api_token="broken_token")
+
+    # organization does not exist in the first check but it is created before the second check
+    with patch(
+        "apps.grafana_plugin.helpers.gcom.Organization.objects.filter", return_value=Organization.objects.none()
+    ):
+        with patch(
+            "apps.grafana_plugin.helpers.GcomAPIClient.get_instance_info",
+            return_value=instance_info,
+        ) as mock_instance_info:
+            check_gcom_permission(gcom_token, context)
+            mock_instance_info.assert_called()
+
+    org.refresh_from_db()
+    assert org.stack_id == instance_info["id"]
+    assert org.stack_slug == instance_info["slug"]
+    assert org.grafana_url == instance_info["url"]
+    assert org.org_id == instance_info["orgId"]
+    assert org.org_slug == instance_info["orgSlug"]
+    assert org.org_title == instance_info["orgName"]
+    assert org.region_slug == instance_info["regionSlug"]
+    assert org.cluster_slug == instance_info["clusterSlug"]
+    assert org.api_token == fixed_token
+    assert org.gcom_token == gcom_token