diff --git a/python/PyQt6/core/auto_generated/qgsoptional.sip.in b/python/PyQt6/core/auto_generated/qgsoptional.sip.in
index 2e3b3d6a81bc..e4b4b91210b1 100644
--- a/python/PyQt6/core/auto_generated/qgsoptional.sip.in
+++ b/python/PyQt6/core/auto_generated/qgsoptional.sip.in
@@ -72,6 +72,7 @@ Set the payload data
 
 };
 
+
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *
diff --git a/python/core/auto_generated/qgsoptional.sip.in b/python/core/auto_generated/qgsoptional.sip.in
index 2e3b3d6a81bc..e4b4b91210b1 100644
--- a/python/core/auto_generated/qgsoptional.sip.in
+++ b/python/core/auto_generated/qgsoptional.sip.in
@@ -72,6 +72,7 @@ Set the payload data
 
 };
 
+
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *
diff --git a/src/core/qgsoptional.h b/src/core/qgsoptional.h
index 921b3aa2d943..9347f4c57920 100644
--- a/src/core/qgsoptional.h
+++ b/src/core/qgsoptional.h
@@ -129,4 +129,11 @@ class CORE_EXPORT QgsOptional
     T mData;
 };
 
+// These typedefs are in place to work around a SIP bug:
+// https://github.com/Python-SIP/sip/issues/66
+#ifndef SIP_RUN
+#include "qgsexpression.h"
+typedef QgsOptional<QgsExpression> QgsOptionalQgsExpressionBase;
+#endif
+
 #endif // QGSOPTIONAL_H
diff --git a/src/core/qgsrange.h b/src/core/qgsrange.h
index 163121301662..720c38315822 100644
--- a/src/core/qgsrange.h
+++ b/src/core/qgsrange.h
@@ -219,6 +219,12 @@ class QgsRange
 
 };
 
+// These typedefs are in place to work around a SIP bug:
+// https://github.com/Python-SIP/sip/issues/66
+#ifndef SIP_RUN
+typedef QgsRange<double> QgsRangedoubleBase;
+typedef QgsRange<int> QgsRangeintBase;
+#endif
 
 /**
  * \brief QgsRange which stores a range of double values.