diff --git a/plugins/delete-by-query/src/main/java/org/elasticsearch/action/deletebyquery/TransportDeleteByQueryAction.java b/plugins/delete-by-query/src/main/java/org/elasticsearch/action/deletebyquery/TransportDeleteByQueryAction.java
index de8d3c84f1a..7f06ce6a6a5 100644
--- a/plugins/delete-by-query/src/main/java/org/elasticsearch/action/deletebyquery/TransportDeleteByQueryAction.java
+++ b/plugins/delete-by-query/src/main/java/org/elasticsearch/action/deletebyquery/TransportDeleteByQueryAction.java
@@ -174,13 +174,15 @@ public class TransportDeleteByQueryAction extends HandledTransportAction<DeleteB
 
             if ((docs.length == 0) || (nextScrollId == null)) {
                 logger.trace("scrolling documents terminated");
-                finishHim(scrollId, false, null);
+                // if scrollId is null we are on the first request - just pass the nextScrollId which sill be non-null if the query matched no docs
+                finishHim(scrollId == null ? nextScrollId : scrollId, false, null);
                 return;
             }
 
             if (hasTimedOut()) {
                 logger.trace("scrolling documents timed out");
-                finishHim(scrollId, true, null);
+                // if scrollId is null we are on the first request - just pass the nextScrollId which sill be non-null if the query matched no docs
+                finishHim(scrollId == null ? nextScrollId : scrollId, true, null);
                 return;
             }
 
diff --git a/plugins/delete-by-query/src/main/java/org/elasticsearch/plugin/deletebyquery/DeleteByQueryModule.java b/plugins/delete-by-query/src/main/java/org/elasticsearch/plugin/deletebyquery/DeleteByQueryModule.java
deleted file mode 100644
index 338a7141bd6..00000000000
--- a/plugins/delete-by-query/src/main/java/org/elasticsearch/plugin/deletebyquery/DeleteByQueryModule.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.elasticsearch.plugin.deletebyquery;
-
-import org.elasticsearch.action.ActionModule;
-import org.elasticsearch.common.inject.AbstractModule;
-import org.elasticsearch.common.inject.Module;
-import org.elasticsearch.common.inject.PreProcessModule;
-import org.elasticsearch.action.deletebyquery.DeleteByQueryAction;
-import org.elasticsearch.action.deletebyquery.TransportDeleteByQueryAction;
-import org.elasticsearch.rest.action.deletebyquery.RestDeleteByQueryAction;
-import org.elasticsearch.rest.RestModule;
-
-public class DeleteByQueryModule extends AbstractModule implements PreProcessModule {
-
-    @Override
-    public void processModule(Module module) {
-        if (module instanceof RestModule) {
-            RestModule restModule = (RestModule) module;
-            restModule.addRestAction(RestDeleteByQueryAction.class);
-        }
-        if (module instanceof ActionModule) {
-            ActionModule actionModule = (ActionModule) module;
-            actionModule.registerAction(DeleteByQueryAction.INSTANCE, TransportDeleteByQueryAction.class);
-        }
-    }
-
-    @Override
-    protected void configure() {
-    }
-}
diff --git a/plugins/delete-by-query/src/main/java/org/elasticsearch/plugin/deletebyquery/DeleteByQueryPlugin.java b/plugins/delete-by-query/src/main/java/org/elasticsearch/plugin/deletebyquery/DeleteByQueryPlugin.java
index 7e50e932bf6..b189745408f 100644
--- a/plugins/delete-by-query/src/main/java/org/elasticsearch/plugin/deletebyquery/DeleteByQueryPlugin.java
+++ b/plugins/delete-by-query/src/main/java/org/elasticsearch/plugin/deletebyquery/DeleteByQueryPlugin.java
@@ -19,8 +19,13 @@
 
 package org.elasticsearch.plugin.deletebyquery;
 
+import org.elasticsearch.action.ActionModule;
+import org.elasticsearch.action.deletebyquery.DeleteByQueryAction;
+import org.elasticsearch.action.deletebyquery.TransportDeleteByQueryAction;
 import org.elasticsearch.common.inject.Module;
 import org.elasticsearch.plugins.Plugin;
+import org.elasticsearch.rest.RestModule;
+import org.elasticsearch.rest.action.deletebyquery.RestDeleteByQueryAction;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -39,8 +44,12 @@ public class DeleteByQueryPlugin extends Plugin {
         return "Elasticsearch Delete-By-Query Plugin";
     }
 
-    @Override
-    public Collection<Module> nodeModules() {
-        return Collections.<Module>singletonList(new DeleteByQueryModule());
+    public void onModule(ActionModule actionModule) {
+        actionModule.registerAction(DeleteByQueryAction.INSTANCE, TransportDeleteByQueryAction.class);
     }
+
+    public void onModule(RestModule restModule) {
+        restModule.addRestAction(RestDeleteByQueryAction.class);
+    }
+
 }