diff --git a/docs/upgrades/upgrade_7.9.4-7.9.5.pl b/docs/upgrades/upgrade_7.9.4-7.9.5.pl
index 22d7305fa..bc84dffd0 100644
--- a/docs/upgrades/upgrade_7.9.4-7.9.5.pl
+++ b/docs/upgrades/upgrade_7.9.4-7.9.5.pl
@@ -62,11 +62,19 @@ sub addRejectNoticeSetting {
 sub updateGroupGroupingsTable {
     my $session = shift;
     print "\tAdding primary key and indicies to groupGroupings table... " unless $quiet;
-    $session->db->write("alter table groupGroupings add primary key (groupId,inGroup)");
-    $session->db->write("alter table groupGroupings add index inGroup (inGroup)");
+    my $sth = $session->db->read('show create table groupGroupings');
+    my ($field,$stmt) = $sth->array;
+    $sth->finish;
+    unless ($stmt =~ m/PRIMARY KEY/i) {
+        $session->db->write("alter table groupGroupings add primary key (groupId,inGroup)");
+    }
+    unless ($stmt =~ m/KEY `inGroup`/i) {
+        $session->db->write("alter table groupGroupings add index inGroup (inGroup)");
+    }
     print "DONE!\n" unless $quiet;
 }
 
+
 #----------------------------------------------------------------------------
 # Describe what our function does
 sub fixRequestForApprovalScratch {