diff --git a/src/modules/graphics/opengl.c b/src/modules/graphics/opengl.c
index 52ca60ce..bd726a68 100644
--- a/src/modules/graphics/opengl.c
+++ b/src/modules/graphics/opengl.c
@@ -1932,8 +1932,13 @@ void lovrTextureSetFilter(Texture* texture, TextureFilter filter) {
 
   switch (filter.mode) {
     case FILTER_NEAREST:
-      glTexParameteri(texture->target, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-      glTexParameteri(texture->target, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+      if (texture->mipmaps) {
+        glTexParameteri(texture->target, GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_NEAREST);
+        glTexParameteri(texture->target, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+      } else {
+        glTexParameteri(texture->target, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+        glTexParameteri(texture->target, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+      }
       break;
 
     case FILTER_BILINEAR: