diff --git a/templates/representatives/_representative_block.haml b/templates/representatives/_representative_block.haml
index 769f0853309f4bd20f7bc51546faecf32759fa21..e4d2a4c1892875a652765e812c5897286e5aedae 100644
--- a/templates/representatives/_representative_block.haml
+++ b/templates/representatives/_representative_block.haml
@@ -21,8 +21,8 @@
         %tr
           %th Chamber
           %td<
-            %a{'href': "{% url 'representatives:representative-list' group_kind='chamber' group=representative.main_mandate.group.chamber.name %}"}
-              = representative.main_mandate.group.chamber|chamber_icon
+            %a{'href': "{% url 'representatives:representative-list' group_kind='chamber' group=representative.chamber.name %}"}
+              = representative.chamber|chamber_icon
         %tr
           %th Country
           %td<
diff --git a/templates/representatives/representative_grid.haml b/templates/representatives/representative_grid.haml
index f28e964752752e17f969f507201069af5635a5c8..5ec3681e2c139dfa3d869c2ed4e031b8fdb3c8bb 100644
--- a/templates/representatives/representative_grid.haml
+++ b/templates/representatives/representative_grid.haml
@@ -16,8 +16,8 @@
             %a{'href': "{{ representative.get_absolute_url }}"}
               = representative.full_name
           %li.chamber
-            %a{'href': "{% url 'representatives:representative-list' group_kind='chamber' group=representative.main_mandate.group.chamber.name %}"}
-              = representative.main_mandate.group.chamber|chamber_icon
+            %a{'href': "{% url 'representatives:representative-list' group_kind='chamber' group=representative.chamber.name %}"}
+              = representative.chamber|chamber_icon
           %li.country
             %a{'href': "{{ representative.country.get_absolute_url }}"}
               = representative.country|country_flag
diff --git a/templates/representatives/representative_list.haml b/templates/representatives/representative_list.haml
index 5cb5e7f3532fc32a1a4b913906e5f47c3e6794c8..43f9db068ab0d1825f83a4493ad42434d3de42ff 100644
--- a/templates/representatives/representative_list.haml
+++ b/templates/representatives/representative_list.haml
@@ -47,8 +47,8 @@
               = representative.full_name
 
           %td
-            %a{'href': "{% url 'representatives:representative-list' group_kind='chamber' group=representative.main_mandate.group.chamber.name %}"}
-              = representative.main_mandate.group.chamber
+            %a{'href': "{% url 'representatives:representative-list' group_kind='chamber' group=representative.chamber.name %}"}
+              = representative.chamber
 
           %td
             %a{'href': "{{ representative.country.get_absolute_url }}"}