diff --git a/src/graphics/graphics.c b/src/graphics/graphics.c
index c682e57f..7e41bed8 100644
--- a/src/graphics/graphics.c
+++ b/src/graphics/graphics.c
@@ -324,12 +324,12 @@ void lovrGraphicsSetLineWidth(float width) {
 }
 
 float lovrGraphicsGetPointSize() {
-  return state.pipeline->pointSize;
+  return state.pointSize;
 }
 
 void lovrGraphicsSetPointSize(float size) {
-  if (state.pipeline->pointSize != size) {
-    state.pipeline->pointSize = size;
+  if (state.pointSize != size) {
+    state.pointSize = size;
   }
 }
 
@@ -486,7 +486,7 @@ void lovrGraphicsFlush() {
   lovrShaderSetInts(shader, "lovrViewportCount", &viewportCount, 0, 1);
 
   // Point size
-  lovrShaderSetFloats(shader, "lovrPointSize", &state.pipeline->pointSize, 0, 1);
+  lovrShaderSetFloats(shader, "lovrPointSize", &state.pointSize, 0, 1);
 
   // Buffers and Mesh
   int vertexCount = state.vertexCursor - state.batchVertex;
diff --git a/src/graphics/graphics.h b/src/graphics/graphics.h
index 72e50564..06e4781e 100644
--- a/src/graphics/graphics.h
+++ b/src/graphics/graphics.h
@@ -107,7 +107,6 @@ typedef struct {
   CompareMode depthTest;
   bool depthWrite;
   float lineWidth;
-  float pointSize;
   Shader* shader;
   CompareMode stencilMode;
   int stencilValue;
@@ -151,6 +150,7 @@ typedef struct {
   Canvas* canvas;
   Color color;
   Font* font;
+  float pointSize;
   DrawRequest batch;
   int batchVertex;
   int batchIndex;