diff --git a/debian/patches/fix-8-to-10-migration.patch b/debian/patches/fix-8-to-10-migration.patch
new file mode 100644
index 0000000000..1f1787cf29
--- /dev/null
+++ b/debian/patches/fix-8-to-10-migration.patch
@@ -0,0 +1,22 @@
+Required to support updation from 8 to 10
+
+Bug, upstream: https://gitlab.com/gitlab-org/gitlab-ce/issues/48040
+
+diff --git a/lib/gitlab/gitaly_client.rb b/lib/gitlab/gitaly_client.rb
+index 0abae70c443..e4ff8261120 100644
+--- a/lib/gitlab/gitaly_client.rb
++++ b/lib/gitlab/gitaly_client.rb
+@@ -216,6 +216,12 @@ module Gitlab
+       # Disabled features are always off!
+       return false if status == MigrationStatus::DISABLED
+
++      # If the features table does not exist, don't check the feature, just return
++      # the default
++      unless Feature::FlipperFeature.table_exists?
++        return (status == MigrationStatus::OPT_OUT) || opt_into_all_features?
++      end
++
+       feature = Feature.get("gitaly_#{feature_name}")
+
+       # If the feature has been set, always evaluate
+
diff --git a/debian/patches/series b/debian/patches/series
index 68db724326..31d04139a6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -20,3 +20,4 @@ add-system-lib-path-for-webpack.patch
 remove-bundle-analyzer.patch
 fix-mail-room-path.patch
 relax-ruby-version.pacth
+fix-8-to-10-migration.patch