diff --git a/IRCCloud/Classes/URLHandler.m b/IRCCloud/Classes/URLHandler.m
index 1b9efdb28..6440531d8 100644
--- a/IRCCloud/Classes/URLHandler.m
+++ b/IRCCloud/Classes/URLHandler.m
@@ -112,7 +112,7 @@ @implementation URLHandler
 
 #define IS_GIPHY(url) ((([url.host.lowercaseString isEqualToString:@"giphy.com"] || [url.host.lowercaseString isEqualToString:@"www.giphy.com"]) && [url.path.lowercaseString hasPrefix:@"/gifs/"]) || [url.host.lowercaseString isEqualToString:@"gph.is"])
 
-#define IS_YOUTUBE(url) ((([url.host.lowercaseString isEqualToString:@"youtube.com"] || [url.host.lowercaseString hasSuffix:@".youtube.com"]) && [url.path.lowercaseString hasPrefix:@"/watch"]) || [url.host.lowercaseString isEqualToString:@"youtu.be"])
+#define IS_YOUTUBE(url) ((([url.host.lowercaseString isEqualToString:@"youtube.com"] || [url.host.lowercaseString hasSuffix:@".youtube.com"]) && [url.path.lowercaseString hasPrefix:@"/watch"]) || ([url.host.lowercaseString isEqualToString:@"youtu.be"] && url.path.length > 1))
 
 #define IS_WIKI(url) ([url.path.lowercaseString hasPrefix:@"/wiki/"] && HAS_IMAGE_SUFFIX(url.absoluteString.lowercaseString))
 
diff --git a/build-scripts/BUILD b/build-scripts/BUILD
index c2807f7f3..acfba6095 100644
--- a/build-scripts/BUILD
+++ b/build-scripts/BUILD
@@ -1 +1 @@
-140
\ No newline at end of file
+141
\ No newline at end of file