diff --git a/src/common/rendering/v_video.cpp b/src/common/rendering/v_video.cpp
index ab9a2c0fc..c19cbcdff 100644
--- a/src/common/rendering/v_video.cpp
+++ b/src/common/rendering/v_video.cpp
@@ -81,7 +81,7 @@ CUSTOM_CVAR(Int, gl_pipeline_depth, 0, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_N
 	Printf("Changing the pipeline depth requires a restart for " GAMENAME ".\n");
 }
 
-CUSTOM_CVAR(Int, vid_maxfps, 200, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
+CUSTOM_CVAR(Int, vid_maxfps, 500, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
 {
 	if (self < GameTicRate && self != 0)
 	{
diff --git a/src/common/rendering/vulkan/system/vk_commandbuffer.cpp b/src/common/rendering/vulkan/system/vk_commandbuffer.cpp
index 41dc568e5..683a3b7ff 100644
--- a/src/common/rendering/vulkan/system/vk_commandbuffer.cpp
+++ b/src/common/rendering/vulkan/system/vk_commandbuffer.cpp
@@ -173,7 +173,8 @@ void VkCommandBufferManager::WaitForCommands(bool finish, bool uploadOnly)
 
 	if (finish)
 	{
-		fb->FPSLimit();
+		if (!fb->GetVSync())
+			fb->FPSLimit();
 		fb->GetFramebufferManager()->QueuePresent();
 	}