diff --git a/src/effects/index.ts b/src/effects/index.ts
index 23864a5d90e..fe14fe28f8f 100644
--- a/src/effects/index.ts
+++ b/src/effects/index.ts
@@ -18,6 +18,7 @@ import { _t, _td } from "../languageHandler";
 import { ConfettiOptions } from "./confetti";
 import { Effect } from "./effect";
 import { FireworksOptions } from "./fireworks";
+import { RainfallOptions } from "./rainfall";
 import { SnowfallOptions } from "./snowfall";
 import { SpaceInvadersOptions } from "./spaceinvaders";
 
@@ -50,6 +51,17 @@ export const CHAT_EFFECTS: Array<Effect<{ [key: string]: any }>> = [
             gravity: 0.05,
         },
     } as Effect<FireworksOptions>,
+    {
+        emojis: ['🌧️', '⛈️', '🌦️'],
+        msgType: 'io.element.effect.rainfall',
+        command: 'rainfall',
+        description: () => _td("Sends the given message with rainfall"),
+        fallbackMessage: () => _t("sends rainfall") + " 🌧️",
+        options: {
+            maxCount: 600,
+            speed: 10,
+        },
+    } as Effect<RainfallOptions>,
     {
         emojis: ['❄', '🌨'],
         msgType: 'io.element.effect.snowfall',
diff --git a/src/effects/rainfall/index.ts b/src/effects/rainfall/index.ts
new file mode 100644
index 00000000000..bfee5159802
--- /dev/null
+++ b/src/effects/rainfall/index.ts
@@ -0,0 +1,131 @@
+/*
+ Copyright 2020 The Matrix.org Foundation C.I.C.
+ Copyright 2021 Josias Allestad
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+import ICanvasEffect from '../ICanvasEffect';
+import { arrayFastClone } from "../../utils/arrays";
+
+export type RainfallOptions = {
+    /**
+     * The maximum number of raindrops to render at a given time
+     */
+    maxCount: number;
+    /**
+     * The speed of the raindrops
+     */
+    speed: number;
+};
+
+type Raindrop = {
+    x: number;
+    y: number;
+    height: number;
+    width: number;
+    speed: number;
+};
+
+export const DefaultOptions: RainfallOptions = {
+    maxCount: 600,
+    speed: 12,
+};
+
+const KEY_FRAME_INTERVAL = 15;
+
+export default class Rainfall implements ICanvasEffect {
+    private readonly options: RainfallOptions;
+
+    constructor(options: { [key: string]: any }) {
+        this.options = { ...DefaultOptions, ...options };
+    }
+
+    private context: CanvasRenderingContext2D | null = null;
+    private particles: Array<Raindrop> = [];
+    private lastAnimationTime: number;
+
+    public isRunning: boolean;
+
+    public start = async (canvas: HTMLCanvasElement, timeout = 3000) => {
+        if (!canvas) {
+            return;
+        }
+        this.context = canvas.getContext('2d');
+        this.particles = [];
+        const count = this.options.maxCount;
+        while (this.particles.length < count) {
+            this.particles.push(this.resetParticle({} as Raindrop, canvas.width, canvas.height));
+        }
+        this.isRunning = true;
+        requestAnimationFrame(this.renderLoop);
+        if (timeout) {
+            window.setTimeout(this.stop, timeout);
+        }
+    };
+
+    public stop = async () => {
+        this.isRunning = false;
+    };
+
+    private resetParticle = (particle: Raindrop, width: number, height: number): Raindrop => {
+        particle.x = Math.random() * width;
+        particle.y = Math.random() * -height;
+        particle.width = Math.random() * 1.5;
+        particle.height = (particle.width * 15) + 4;
+        particle.speed = (Math.random() * this.options.speed * 4/5) + this.options.speed;
+        return particle;
+    };
+
+    private renderLoop = (): void => {
+        if (!this.context || !this.context.canvas) {
+            return;
+        }
+        if (this.particles.length === 0) {
+            this.context.clearRect(0, 0, this.context.canvas.width, this.context.canvas.height);
+        } else {
+            const timeDelta = Date.now() - this.lastAnimationTime;
+            if (timeDelta >= KEY_FRAME_INTERVAL || !this.lastAnimationTime) {
+                // Clear the screen first
+                this.context.clearRect(0, 0, this.context.canvas.width, this.context.canvas.height);
+                this.lastAnimationTime = Date.now();
+                this.animateAndRenderRaindrops();
+            }
+            requestAnimationFrame(this.renderLoop);
+        }
+    };
+
+    private animateAndRenderRaindrops = (): void => {
+        if (!this.context || !this.context.canvas) {
+            return;
+        }
+        const height = this.context.canvas.height;
+        for (const particle of arrayFastClone(this.particles)) {
+            particle.y += particle.speed;
+
+            this.context.save();
+            this.context.beginPath();
+            this.context.rect(particle.x, particle.y, particle.width, particle.height);
+            this.context.fillStyle = '#5dadec'; // light blue
+            this.context.fill();
+            this.context.closePath();
+            this.context.restore();
+
+            // Remove dead raindrops
+            const maxBounds = height * 2;
+            if (particle.y > (height + maxBounds)) {
+                const idx = this.particles.indexOf(particle);
+                this.particles.splice(idx, 1);
+            }
+        }
+    };
+}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index db3eb8e58df..c7a2679f7b1 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -913,6 +913,8 @@
     "sends confetti": "sends confetti",
     "Sends the given message with fireworks": "Sends the given message with fireworks",
     "sends fireworks": "sends fireworks",
+    "Sends the given message with rainfall": "Sends the given message with rainfall",
+    "sends rainfall": "sends rainfall",
     "Sends the given message with snowfall": "Sends the given message with snowfall",
     "sends snowfall": "sends snowfall",
     "Sends the given message with a space themed effect": "Sends the given message with a space themed effect",