diff --git a/pelican/server.py b/pelican/server.py
index 9074135b..ad68a3bc 100644
--- a/pelican/server.py
+++ b/pelican/server.py
@@ -18,6 +18,10 @@ class ComplexHTTPRequestHandler(srvmod.SimpleHTTPRequestHandler):
     SUFFIXES = ['', '.html', '/index.html']
 
     def do_GET(self):
+        # cut off a query string
+        if '?' in self.path:
+            self.path, _ = self.path.split('?', 1)
+
         # Try to detect file by applying various suffixes
         for suffix in self.SUFFIXES:
             if not hasattr(self, 'original_path'):