diff --git a/src/modules/graphics/Texture.cpp b/src/modules/graphics/Texture.cpp
index 8897b8de7..7b9345f9b 100644
--- a/src/modules/graphics/Texture.cpp
+++ b/src/modules/graphics/Texture.cpp
@@ -233,6 +233,9 @@ Texture::Texture(const Settings &settings, const Slices *slices)
 	if (mipmapsMode != MIPMAPS_NONE)
 		mipmapCount = getTotalMipmapCount(pixelWidth, pixelHeight, depth);
 
+	if (mipmapsMode == MIPMAPS_AUTO && isPixelFormatDepthStencil(format))
+		throw love::Exception("Automatic mipmap generation cannot be used for depth/stencil textures.");
+
 	if (pixelWidth <= 0 || pixelHeight <= 0 || layers <= 0 || depth <= 0)
 		throw love::Exception("Texture dimensions must be greater than 0.");
 
@@ -498,6 +501,9 @@ void Texture::generateMipmaps()
 	if (isPixelFormatCompressed(format))
 		throw love::Exception("generateMipmaps cannot be called on a compressed Texture.");
 
+	if (isPixelFormatDepthStencil(format))
+		throw love::Exception("generateMipmaps cannot be called on a depth/stencil Texture.");
+
 	generateMipmapsInternal();
 }
 
diff --git a/src/modules/graphics/opengl/Graphics.cpp b/src/modules/graphics/opengl/Graphics.cpp
index 463f88eb3..56ff3aa60 100644
--- a/src/modules/graphics/opengl/Graphics.cpp
+++ b/src/modules/graphics/opengl/Graphics.cpp
@@ -717,15 +717,12 @@ void Graphics::endPass()
 		}
 	}
 
+	// generateMipmaps can't be used for depth/stencil textures.
 	for (const auto &rt : rts.colors)
 	{
 		if (rt.texture->getMipmapsMode() == Texture::MIPMAPS_AUTO && rt.mipmap == 0)
 			rt.texture->generateMipmaps();
 	}
-
-	int dsmipmap = rts.depthStencil.mipmap;
-	if (depthstencil != nullptr && depthstencil->getMipmapsMode() == Texture::MIPMAPS_AUTO && dsmipmap == 0)
-		depthstencil->generateMipmaps();
 }
 
 void Graphics::clear(OptionalColorf c, OptionalInt stencil, OptionalDouble depth)