diff --git a/storage/innobase/fts/fts0fts.cc b/storage/innobase/fts/fts0fts.cc
index b1bab34..63953db 100644
--- a/storage/innobase/fts/fts0fts.cc
+++ b/storage/innobase/fts/fts0fts.cc
@@ -7778,8 +7778,12 @@ fts_load_stopword(
 			stopword_to_use = (const char*) str.f_str;
 		}
 	} else {
-		stopword_to_use = (session_stopword_table)
-			? session_stopword_table : global_stopword_table;
+		if (session_stopword_table != NULL
+		    && strlen(session_stopword_table) > 0) {
+			stopword_to_use = session_stopword_table;
+		} else {
+			stopword_to_use = global_stopword_table;
+		}
 	}
 
 	if (stopword_to_use