diff --git a/hotfix/2.6.2/Dockerfile b/hotfix/2.6.2/Dockerfile
new file mode 100644
index 0000000000..2df365143e
--- /dev/null
+++ b/hotfix/2.6.2/Dockerfile
@@ -0,0 +1,5 @@
+FROM sharelatex/sharelatex:2.6.1
+
+# Patch: fixes overleaf.com onboarding email being sent in CE/SP
+COPY onboarding-email.patch ${baseDir}
+RUN cd ${baseDir} && patch -p0 < onboarding-email.patch
diff --git a/hotfix/2.6.2/onboarding-email.patch b/hotfix/2.6.2/onboarding-email.patch
new file mode 100644
index 0000000000..2d1fed5686
--- /dev/null
+++ b/hotfix/2.6.2/onboarding-email.patch
@@ -0,0 +1,25 @@
+--- /var/www/sharelatex/web/app/src/Features/User/UserCreator.js
++++ /var/www/sharelatex/web/app/src/Features/User/UserCreator.js
+@@ -85,13 +85,15 @@ async function createNewUser(attributes, options = {}) {
+   }
+ 
+   Analytics.recordEvent(user._id, 'user-registered')
+-  try {
+-    await UserOnboardingEmailQueueManager.scheduleOnboardingEmail(user)
+-  } catch (error) {
+-    logger.error(
+-      `Failed to schedule sending of onboarding email for user '${user._id}'`,
+-      error
+-    )
++  if(Features.hasFeature('saas')) {
++    try {
++      await UserOnboardingEmailQueueManager.scheduleOnboardingEmail(user)
++    } catch (error) {
++      logger.error(
++          `Failed to schedule sending of onboarding email for user '${user._id}'`,
++          error
++      )
++    }
+   }
+ 
+   return user