diff --git a/lib/components/term.tsx b/lib/components/term.tsx
index 4df1bfb51698..43d379612dfb 100644
--- a/lib/components/term.tsx
+++ b/lib/components/term.tsx
@@ -215,12 +215,18 @@ export default class Term extends React.PureComponent<
       this.term.open(this.termRef);
 
       if (useWebGL) {
-        this.term.loadAddon(new WebglAddon());
+        const webglAddon = new WebglAddon();
+        this.term.loadAddon(webglAddon);
+        webglAddon.onContextLoss(() => {
+          console.warn('WebGL context lost. Falling back to canvas-based rendering.');
+          webglAddon.dispose();
+          this.term.loadAddon(new CanvasAddon());
+        });
       } else {
         this.term.loadAddon(new CanvasAddon());
       }
 
-      if (props.disableLigatures !== true) {
+      if (props.disableLigatures !== true && !useWebGL) {
         this.term.loadAddon(new LigaturesAddon());
       }