diff --git a/src/MC/fix_gcmc.cpp b/src/MC/fix_gcmc.cpp
index 3d025e12fd..0951100937 100644
--- a/src/MC/fix_gcmc.cpp
+++ b/src/MC/fix_gcmc.cpp
@@ -470,6 +470,15 @@ void FixGCMC::init()
                  "same molecule template ID");
   }
 
+  // check for fix rigid
+
+  int irigid;
+  for (irigid = 0; irigid < modify->nfix; irigid++) {
+    if (strcmp(modify->fix[irigid]->style,"rigid") == 0) break;
+    else if (strcmp(modify->fix[irigid]->style,"rigid/small") == 0) break;
+  }
+  if (irigid < modify->nfix) error->all(FLERR,"Fix gcmc can not currently be used with fix rigid or fix rigid/small");
+
   if (domain->dimension == 2)
     error->all(FLERR,"Cannot use fix gcmc in a 2d simulation");
 
diff --git a/src/MC/fix_gcmc.h b/src/MC/fix_gcmc.h
index 82b4733587..613bcdfc05 100644
--- a/src/MC/fix_gcmc.h
+++ b/src/MC/fix_gcmc.h
@@ -247,6 +247,10 @@ E: Fix gcmc and fix shake not using same molecule template ID
 
 Self-explanatory.
 
+E: Fix gcmc can not currently be used with fix rigid or fix rigid/small
+
+Self-explanatory.
+
 E: Cannot use fix gcmc in a 2d simulation
 
 Fix gcmc is set up to run in 3d only. No 2d simulations with fix gcmc