diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 47b834819..e2927eca2 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -23,6 +23,7 @@
  - fixed #10717: i18n Asset_Survey::recordedAnswer and Asset_Survey::recorded answer description
  - fixed #10716: i18n Asset_Survey::questions on section page descriptio
  - fixed #10715: i18n Asset_Survey::showProgress 
+ - fixed #10721: Invalid/Missing Style TemplateIds in use
 
 7.7.16
  - fixed #10590: Session::DateTime->secondsToInterval doesn't allow 7 weeks
diff --git a/docs/upgrades/upgrade_7.7.16-7.7.17.pl b/docs/upgrades/upgrade_7.7.16-7.7.17.pl
index eeca9facf..525ec2228 100644
--- a/docs/upgrades/upgrade_7.7.16-7.7.17.pl
+++ b/docs/upgrades/upgrade_7.7.16-7.7.17.pl
@@ -32,6 +32,8 @@ my $session = start(); # this line required
 
 # upgrade functions go here
 addFriendManagerSettings($session);
+fixGalleyImageFolderStyle($session);
+fixMapTemplateFolderStyle($session);
 
 finish($session); # this line required
 
@@ -53,6 +55,37 @@ sub addFriendManagerSettings {
     print "DONE!\n" unless $quiet;
 }
 
+#----------------------------------------------------------------------------
+# Describe what our function does
+sub fixMapTemplateFolderStyle {
+    my $session = shift;
+    print "\tFix the Map Template subfolder style template... " unless $quiet;
+    my $folder = WebGUI::Asset->new($session, 'brxm_faNdZX5tRo3p50g3g', 'WebGUI::Asset::Wobject::Folder');
+    return unless $folder;
+    if ($folder) {
+        $folder->addRevision({
+            styleTemplateId => 'PBtmpl0000000000000060',
+        });
+    }
+    # and here's our code
+    print "DONE!\n" unless $quiet;
+}
+
+#----------------------------------------------------------------------------
+# Describe what our function does
+sub fixGalleyImageFolderStyle {
+    my $session = shift;
+    print "\tFix the gallery image subfolder style template... " unless $quiet;
+    my $folder = WebGUI::Asset->new($session, 'kaPRSaf8UKiskiGEgJgLAw', 'WebGUI::Asset::Wobject::Folder');
+    if ($folder) {
+        $folder->addRevision({
+            styleTemplateId => 'PBtmpl0000000000000060',
+        });
+    }
+    # and here's our code
+    print "DONE!\n" unless $quiet;
+}
+
 # -------------- DO NOT EDIT BELOW THIS LINE --------------------------------
 
 #----------------------------------------------------------------------------