diff --git a/4J.Render/4J_Render.cpp b/4J.Render/4J_Render.cpp
index 54aeb9d6f..571a3d171 100644
--- a/4J.Render/4J_Render.cpp
+++ b/4J.Render/4J_Render.cpp
@@ -94,7 +94,7 @@ void C4JRender::Initialise()
     }
 
     glfwMakeContextCurrent(s_window);
-    glfwSwapInterval(1);  // vsync
+    glfwSwapInterval(0);  // vsync
 
     // Keep viewport in sync with OS-driven window resizes.
     glfwSetFramebufferSizeCallback(s_window, onFramebufferResize);
diff --git a/Minecraft.Client/Rendering/GameRenderer.cpp b/Minecraft.Client/Rendering/GameRenderer.cpp
index 1d2eeb30f..93490f169 100644
--- a/Minecraft.Client/Rendering/GameRenderer.cpp
+++ b/Minecraft.Client/Rendering/GameRenderer.cpp
@@ -1068,11 +1068,11 @@ void GameRenderer::render(float a, bool bFirst)
 	int xMouse = Mouse::getX() * screenWidth / fbw;
 	int yMouse = screenHeight - Mouse::getY() * screenHeight / fbh - 1;
 
-	int maxFps = getFpsCap(mc->options->framerateLimit);
+	int maxFps = 0;//getFpsCap(mc->options->framerateLimit);
 
 	if (mc->level != NULL)
 	{
-		if (mc->options->framerateLimit == 0)
+		if (maxFps == 0)
 		{
 			renderLevel(a, 0);
 		}