diff --git a/modules/juce_gui_basics/native/juce_linux_Windowing.cpp b/modules/juce_gui_basics/native/juce_linux_Windowing.cpp
index 3a8ddfa0cc..206fd1188a 100644
--- a/modules/juce_gui_basics/native/juce_linux_Windowing.cpp
+++ b/modules/juce_gui_basics/native/juce_linux_Windowing.cpp
@@ -1327,6 +1327,7 @@ public:
 
             default:
                #if JUCE_USE_XSHM
+                if (XSHMHelpers::isShmAvailable())
                 {
                     ScopedXLock xlock;
                     if (event.xany.type == XShmGetEventBase (display))
@@ -1902,7 +1903,8 @@ private:
                 for (const Rectangle<int>* i = originalRepaintRegion.begin(), * const e = originalRepaintRegion.end(); i != e; ++i)
                 {
                    #if JUCE_USE_XSHM
-                    ++shmPaintsPending;
+                    if (XSHMHelpers::isShmAvailable())
+                        ++shmPaintsPending;
                    #endif
 
                     static_cast<XBitmapImage*> (image.getPixelData())