diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index f1d5c655d166b49205d40685bcbee56284c8d6cc..51ca6648fc03e52822f8c88f1f80aa5a2f9ddb17 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -120,7 +120,7 @@ class ProjectsController < ApplicationController
       if params[:wiki_enabled]
         case params[:wiki_enabled]
         when "0"
-          @project.wiki.destroy
+          @project.wiki.destroy if @project.wiki
         when "1"
           @project.wiki ||= Wiki.new
           @project.wiki.update_attributes params[:wiki]