diff --git a/Common/GPU/Vulkan/VulkanContext.cpp b/Common/GPU/Vulkan/VulkanContext.cpp
index 5cb6760ae4..d11010d3c4 100644
--- a/Common/GPU/Vulkan/VulkanContext.cpp
+++ b/Common/GPU/Vulkan/VulkanContext.cpp
@@ -1301,10 +1301,6 @@ bool VulkanContext::InitSwapchain() {
 			break;
 		}
 	}
-#ifdef __ANDROID__
-	// HACK
-	swapchainPresentMode = VK_PRESENT_MODE_FIFO_KHR;
-#endif
 	delete[] presentModes;
 	// Determine the number of VkImage's to use in the swap chain (we desire to
 	// own only 1 image at a time, besides the images being displayed and
diff --git a/Core/FrameTiming.cpp b/Core/FrameTiming.cpp
index 8c36e2b32f..88c1253218 100644
--- a/Core/FrameTiming.cpp
+++ b/Core/FrameTiming.cpp
@@ -20,7 +20,7 @@ inline Draw::PresentMode GetBestImmediateMode(Draw::PresentMode supportedModes)
 }
 
 void FrameTiming::Reset(Draw::DrawContext *draw) {
-	if (g_Config.bVSync) {
+	if (g_Config.bVSync || !(draw->GetDeviceCaps().presentModesSupported & (Draw::PresentMode::MAILBOX| Draw::PresentMode::IMMEDIATE))) {
 		presentMode = Draw::PresentMode::FIFO;
 		presentInterval = 1;
 	} else {
diff --git a/android/jni/AndroidVulkanContext.cpp b/android/jni/AndroidVulkanContext.cpp
index c763ce9350..7d9c6e4da4 100644
--- a/android/jni/AndroidVulkanContext.cpp
+++ b/android/jni/AndroidVulkanContext.cpp
@@ -82,7 +82,7 @@ bool AndroidVulkanContext::InitAPI() {
 
 	g_Vulkan->ChooseDevice(physicalDevice);
 
-	INFO_LOG(G3D, "Creating Vulkan device");
+	INFO_LOG(G3D, "Creating Vulkan device (flags: %08x)", info.flags);
 	if (g_Vulkan->CreateDevice() != VK_SUCCESS) {
 		INFO_LOG(G3D, "Failed to create vulkan device: %s", g_Vulkan->InitError().c_str());
 		System_Toast("No Vulkan driver found. Using OpenGL instead.");