diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java
index 1f35e4f653..71ce99fc4b 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java
@@ -137,9 +137,8 @@ protected void createHandlers() {
     public synchronized void shutdown() {
         // only if not forced ff or not restarting
         if (_floodfillEnabled &&
-            (!_context.getBooleanProperty(FloodfillMonitorJob.PROP_FLOODFILL_PARTICIPANT) ||
              !(_context.router().scheduledGracefulExitCode() == Router.EXIT_HARD_RESTART ||
-               _context.router().scheduledGracefulExitCode() == Router.EXIT_GRACEFUL_RESTART))) {
+               _context.router().scheduledGracefulExitCode() == Router.EXIT_GRACEFUL_RESTART)) {
             // turn off to build a new RI...
             _floodfillEnabled = false;
             // true -> publish inline