diff --git a/src/util/00-mesa-defaults.conf b/src/util/00-mesa-defaults.conf
index b55896376d5..e454a8d9c0f 100644
--- a/src/util/00-mesa-defaults.conf
+++ b/src/util/00-mesa-defaults.conf
@@ -706,6 +706,9 @@ TODO: document the other workarounds.
         <application name="muffin" executable="muffin">
             <option name="adaptive_sync" value="false" />
         </application>
+        <application name="cinnamon" executable="cinnamon">
+            <option name="adaptive_sync" value="false" />
+        </application>
         <application name="compiz" executable="compiz">
             <option name="adaptive_sync" value="false" />
         </application>
@@ -835,6 +838,9 @@ TODO: document the other workarounds.
         <application name="gnome-shell" executable="gnome-shell">
             <option name="glx_extension_override" value="-GLX_EXT_buffer_age -GLX_OML_sync_control -GLX_SGI_video_sync" />
         </application>
+        <application name="cinnamon" executable="cinnamon">
+            <option name="glx_extension_override" value="-GLX_EXT_buffer_age -GLX_OML_sync_control -GLX_SGI_video_sync" />
+        </application>
         <application name="Compiz" executable="Compiz">
             <option name="glx_extension_override" value="-GLX_EXT_buffer_age -GLX_OML_sync_control" />
         </application>