diff --git a/beamerfontthemejku.sty b/beamerfontthemejku.sty
index a4db5e4..c77e09c 100644
--- a/beamerfontthemejku.sty
+++ b/beamerfontthemejku.sty
@@ -310,6 +310,18 @@
 %% 
 
 \ifbool{jkubeamer@mathastext}{%
+    \ifxetex%
+        % As of version 1.4, mathastext no longer compiles with XeLaTeX unless we
+        % the (deprecated) everymath option or the nominus option. Bug has been
+        % acknowledged by mathastext author. Until then, we are safe to use everymath:
+        \PassOptionsToPackage{everymath}{mathastext}
+        % In the future, we may also want to consider to use nominus (and use the
+        % standard math font for it). In that case, we should do this for at least
+        % the three basic operators +/-/= to achieve consistent operator alignment.
+        % Actually, this looks very promising in combination with FiraMath and we
+        % might want to consider always doing that in future (not just for XeLaTeX):
+        %\PassOptionsToPackage{noplus,nominus,noequal}{mathastext}
+    \fi
     \usepackage[italic,defaultmathsizes,eulergreek,nosmalldelims,unicodeminus]{mathastext}
 }{}