diff --git a/Minecraft.Client/GameState/Options.cpp b/Minecraft.Client/GameState/Options.cpp
index ed1f7eca5..06b08d5bd 100644
--- a/Minecraft.Client/GameState/Options.cpp
+++ b/Minecraft.Client/GameState/Options.cpp
@@ -116,7 +116,13 @@ void Options::init()
     bobView = true;
     anaglyph3d = false;
     advancedOpengl = false;
+    
+    //4JCRAFT V-Sync / VSync 
+    #ifdef ENABLE_VSYNC
     framerateLimit = 2;
+    #else
+    framerateLimit = 3;
+    #endif
     fancyGraphics = true;
     ambientOcclusion = true;
 	renderClouds = true;
@@ -522,4 +528,4 @@ void Options::save()
 bool Options::isCloudsOn()
 {
 	return viewDistance < 2 && renderClouds;
-}
\ No newline at end of file
+}
diff --git a/Minecraft.Client/Rendering/GameRenderer.cpp b/Minecraft.Client/Rendering/GameRenderer.cpp
index 9335fee5b..c81a243b8 100644
--- a/Minecraft.Client/Rendering/GameRenderer.cpp
+++ b/Minecraft.Client/Rendering/GameRenderer.cpp
@@ -2189,6 +2189,8 @@ int GameRenderer::getFpsCap(int option)
 	int maxFps = 200;
 	if (option == 1) maxFps = 120;
 	if (option == 2) maxFps = 35;
+  if (option == 3) maxFps = 0;
+
 	return maxFps;
 }