diff --git a/lib/RenderApp.pm b/lib/RenderApp.pm
index d3d11e3c1..04b306f55 100644
--- a/lib/RenderApp.pm
+++ b/lib/RenderApp.pm
@@ -85,35 +85,6 @@ sub startup {
 		$self->helper(logAttempt => sub { shift; $resultsLog->info(@_); });
 	}
 
-	# Add Cache-Control and Expires headers to static content from webwork2_files
-	if (my $STATIC_EXPIRES = $self->config('STATIC_EXPIRES')) {
-		$STATIC_EXPIRES = int($STATIC_EXPIRES);
-		my $cache_control_setting = "max-age=$STATIC_EXPIRES";
-		my $no_cache_setting      = 'max-age=1, no-cache';
-		$self->hook(
-			after_dispatch => sub {
-				my $c = shift;
-
-				# Only process if file requested is under webwork2_files
-				return unless ($c->req->url->path =~ '^/webwork2_files/');
-
-				if ($c->req->url->path =~ '/tmp/renderer') {
-					# Treat problem generated files as already expired.
-					# They should not be cached.
-					$c->res->headers->cache_control($no_cache_setting);
-					$c->res->headers->header(
-						Expires => Mojo::Date->new(time - 86400)    # expired 24 hours ago
-					);
-				} else {
-					# Standard "static" files.
-					# They can be cached
-					$c->res->headers->cache_control($cache_control_setting);
-					$c->res->headers->header(Expires => Mojo::Date->new(time + $STATIC_EXPIRES));
-				}
-			}
-		);
-	}
-
 	# Models
 	$self->helper(newProblem => sub { shift; RenderApp::Model::Problem->new(@_) });
 
diff --git a/render_app.conf.dist b/render_app.conf.dist
index 0087f33ea..084609d5a 100644
--- a/render_app.conf.dist
+++ b/render_app.conf.dist
@@ -6,7 +6,6 @@
   webworkJWTsecret => 'private',
   SITE_HOST => 'http://localhost:3000',
   CORS_ORIGIN => '*',
-  STATIC_EXPIRES => 86400,
   STRICT_JWT => 0,
   FULL_APP_INSECURE => 0,
   INTERACTION_LOG => 0,