diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt
index 755c04153..e585d0651 100644
--- a/docs/CHANGES.txt
+++ b/docs/CHANGES.txt
@@ -51,6 +51,11 @@ https://tuxpaint.org/
       (shows when certain features are enabled; not just disabled)
       Bill Kendrick <bill@newbreedsoftware.com>
 
+  * Bug Fixes:
+    ----------
+    * Don't try to load a blank-named template during slideshow playback.
+      Bill Kendrick <bill@newbreedsoftware.com>
+
   * Localization Updates:
     ---------------------
     * Chinese (Simplified) translation
diff --git a/src/tuxpaint.c b/src/tuxpaint.c
index 4e0ba2f1f..c90dfe9e5 100644
--- a/src/tuxpaint.c
+++ b/src/tuxpaint.c
@@ -22,7 +22,7 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   (See COPYING.txt)
 
-  June 14, 2002 - April 12, 2023
+  June 14, 2002 - April 19, 2023
 */
 
 #include "platform.h"
@@ -20030,8 +20030,10 @@ static void play_slideshow(int *selected, int num_selected, char *dirname,
           if (starter_flipped)
             flip_starter();
         }
-        else
+        else if (template_id[0] != '\0')
+        {
           load_template(template_id);
+        }
       }
 
       /* "Back" button: */