diff --git a/src/client/component/fastfiles.cpp b/src/client/component/fastfiles.cpp
index 5b3351a0..b4b4de43 100644
--- a/src/client/component/fastfiles.cpp
+++ b/src/client/component/fastfiles.cpp
@@ -228,16 +228,18 @@ namespace fastfiles
 				return INVALID_HANDLE_VALUE;
 			}
 
-			if (name.ends_with(".ff"))
+			auto handle = sys_createfile_hook.invoke<HANDLE>(folder, base_filename);
+			if (handle != INVALID_HANDLE_VALUE)
 			{
-				const auto handle = find_fastfile(name, true);
-				if (handle != INVALID_HANDLE_VALUE)
-				{
-					return handle;
-				}
+				return handle;
 			}
 
-			return sys_createfile_hook.invoke<HANDLE>(folder, base_filename);
+			if (name.ends_with(".ff"))
+			{
+				handle = find_fastfile(name, true);
+			}
+
+			return handle;
 		}
 
 		template <typename T> 
diff --git a/src/client/component/updater.cpp b/src/client/component/updater.cpp
index d19cdc8a..95630eef 100644
--- a/src/client/component/updater.cpp
+++ b/src/client/component/updater.cpp
@@ -328,7 +328,7 @@ namespace updater
 	{
 		return update_data.access<bool>([](update_data_t& data_)
 		{
-			return data_.check.done;
+			return data_.check.done && game::Sys_IsDatabaseReady2();
 		});
 	}