diff --git a/src/main.c b/src/main.c
index 7aff539785dcf5672bd65a7980fd46e89cf4a192..0c84a84f9daf86ee2f063d8b893f38c22d771eae 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1343,6 +1343,7 @@ int main(int argc, char *argv[])
 	bool logtofile = FALSE;
 	bool is_zygote = FALSE;
 	bool os_autoflush = FALSE;
+	bool no_web = FALSE;
 	FILE *logfile = NULL;
 
 	// Parse arguments
@@ -1371,6 +1372,7 @@ int main(int argc, char *argv[])
 		if (!strncmp(arg, "--type=renderer", 15)) is_zygote = TRUE;
 		if (!strncmp(arg, "--no-sandbox", 12)) is_zygote = TRUE;
 		if (!strncmp(arg, "--logtofile", 11)) logtofile = TRUE;
+		if (!strncmp(arg, "--no-web", 8)) no_web = TRUE;
 	}
 
 #ifdef SELFEXE_WINDOWS
@@ -1392,7 +1394,7 @@ int main(int argc, char *argv[])
 	}
 #endif
 
-	te4_web_load();
+	if (!no_web) te4_web_load();
 
 	// Initialize display lock for thread safety.
 	renderingLock = SDL_CreateMutex();
diff --git a/src/web.c b/src/web.c
index 66e22cf31dd9d50e42965b8877dbf6a255678dc4..a44a1d666b45ddd583f63340cd4ef1918db517e2 100644
--- a/src/web.c
+++ b/src/web.c
@@ -577,6 +577,18 @@ void te4_web_load() {
 	printf("WebCore config: library(%s) spawn(%s)\n", libname ? libname : "--", spawnname ? spawnname : "--");
 	printf("Loading WebCore: %s\n", web ? "loaded!" : SDL_GetError());
 
+#if defined(SELFEXE_LINUX) || defined(SELFEXE_BSD)
+	// Hack to fix a strange bug when it fails to load the library on some linux version it core dumps. So we restart a new process and tell it to not even try
+	if (!web) {
+		char **newargs = calloc(g_argc + 2, sizeof(char*));
+		int i;
+		for (i = 0; i < g_argc; i++) newargs[i] = g_argv[i];
+		newargs[g_argc] = strdup("--no-web");
+		newargs[g_argc+1] = NULL;
+		execv(get_self_executable(g_argc, g_argv), newargs);
+	}
+#endif
+
 	if (web) {
 		webcore = TRUE;
 		te4_web_setup = (void (*)(