diff --git a/Common/GPU/Vulkan/VulkanFrameData.cpp b/Common/GPU/Vulkan/VulkanFrameData.cpp
index a95dd42b19..f2be38d298 100644
--- a/Common/GPU/Vulkan/VulkanFrameData.cpp
+++ b/Common/GPU/Vulkan/VulkanFrameData.cpp
@@ -208,10 +208,11 @@ void FrameData::Submit(VulkanContext *vulkan, FrameSubmitType type, FrameDataSha
 
 		cmdBufs[numCmdBufs++] = presentCmd;
 		hasPresentCommands = false;
+	}
 
-		if (type == FrameSubmitType::FinishFrame) {
-			fenceToTrigger = fence;
-		}
+	if (type == FrameSubmitType::FinishFrame) {
+		_dbg_assert_(!fenceToTrigger);
+		fenceToTrigger = fence;
 	}
 
 	if (!numCmdBufs && fenceToTrigger == VK_NULL_HANDLE) {
diff --git a/build.gradle b/build.gradle
index e0b7d16f2c..1c98b6b014 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.3.1'
+        classpath 'com.android.tools.build:gradle:8.5.0'
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 71ed9af82b..1285ff4bb4 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,6 +3,6 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
 android.useAndroidX=true
 android.enableJetifier=true