diff --git a/src/Vulkan/VkQueue.cpp b/src/Vulkan/VkQueue.cpp
index f0978cf..43bb4a0 100644
--- a/src/Vulkan/VkQueue.cpp
+++ b/src/Vulkan/VkQueue.cpp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 #include "VkCommandBuffer.hpp"
+#include "VkFence.hpp"
 #include "VkQueue.hpp"
 #include "VkSemaphore.hpp"
 
@@ -25,11 +26,6 @@
 
 void Queue::submit(uint32_t submitCount, const VkSubmitInfo* pSubmits, VkFence fence)
 {
-	if(fence != VK_NULL_HANDLE)
-	{
-		UNIMPLEMENTED();
-	}
-
 	for(uint32_t i = 0; i < submitCount; i++)
 	{
 		auto& submitInfo = pSubmits[i];
@@ -48,6 +44,12 @@
 			vk::Cast(submitInfo.pSignalSemaphores[j])->signal();
 		}
 	}
+
+	// FIXME (b\117835459): signal the fence only once the work is completed
+	if(fence != VK_NULL_HANDLE)
+	{
+		vk::Cast(fence)->signal();
+	}
 }
 
 } // namespace vk
\ No newline at end of file