diff --git a/dirutil.c b/dirutil.c
index 02e11e90..5c609b0a 100644
--- a/dirutil.c
+++ b/dirutil.c
@@ -280,28 +280,14 @@ create_pg_dir(char *path, bool force)
 
 			if (is_pg_dir(path))
 			{
-				DBState		db_state;
-
-				/* note: state will be DB_SHUTDOWNED if unable to read a control file */
-				db_state = get_db_state(path);
-
 				if (force == true)
 				{
-					if (db_state != DB_SHUTDOWNED && db_state != DB_SHUTDOWNED_IN_RECOVERY)
-					{
-						log_error(_("directory \"%s\" appears to be an active PostgreSQL data directory"), path);
-						log_detail(_("instance appears to be running in state \"%s\""), describe_db_state(db_state));
-						log_hint(_("any running instance must be shut down"));
-						return false;
-					}
 					log_notice(_("deleting existing data directory \"%s\""), path);
 					nftw(path, unlink_dir_callback, 64, FTW_DEPTH | FTW_PHYS);
 					return true;
 				}
-				else
-				{
-					return false;
-				}
+
+				return false;
 			}
 			else
 			{
diff --git a/repmgr-action-standby.c b/repmgr-action-standby.c
index 65a38122..4b73b6ad 100644
--- a/repmgr-action-standby.c
+++ b/repmgr-action-standby.c
@@ -276,22 +276,6 @@ do_standby_clone(void)
 		exit(ERR_BAD_CONFIG);
 	}
 
-	/*
-	 * by this point we should know the target data directory - check there's
-	 * no running Pg instance
-	 */
-	if (is_pg_dir(local_data_directory))
-	{
-		DBState		state = get_db_state(local_data_directory);
-
-		if (state != DB_SHUTDOWNED && state != DB_SHUTDOWNED_IN_RECOVERY)
-		{
-			log_error(_("target data directory appears to contain an active PostgreSQL instance"));
-			log_detail(_("instance state is %s"), describe_db_state(state));
-			exit(ERR_BAD_CONFIG);
-		}
-	}
-
 	if (upstream_conninfo_found == true)
 	{
 		/*
@@ -3289,7 +3273,7 @@ check_source_server()
 		{
 			log_error(_("target data directory appears to be a PostgreSQL data directory"));
 			log_detail(_("target data directory is \"%s\""), local_data_directory);
-			log_hint(_("ensure the target data directory is empty before running \"STANDBY CLONE\" in pg_basebackup mode"));
+			log_hint(_("use -F/--force to overwrite the existing data directory"));
 			PQfinish(source_conn);
 			exit(ERR_BAD_CONFIG);
 		}